- fixed 'When you jump into the roof or a bonus and fall back down you collide with...

[supertux.git] / src / badguy.cpp

diff --git a/src/badguy.cpp b/src/badguy.cpp
index 0866f22..c075dd1 100644 (file)
--- a/src/badguy.cpp
+++ b/src/badguy.cpp
@@ -75,6 +75,8 @@ Sprite* img_snowball_right;
 Sprite* img_snowball_squished_left;
 Sprite* img_snowball_squished_right;
 Sprite* img_wingling_left;
+Sprite* img_walkingtree_left;
+Sprite* img_walkingtree_left_small;
 
 #define BADGUY_WALK_SPEED .8f
 #define WINGLING_FLY_SPEED 1.6f
@@ -103,6 +105,8 @@ BadGuyKind  badguykind_from_string(const std::string& str)
     return BAD_SNOWBALL;
   else if (str == "wingling")
     return BAD_WINGLING;
+  else if (str == "walkingtree")
+    return BAD_WALKINGTREE;
   else
     {
       printf("Couldn't convert badguy: '%s'\n", str.c_str());
@@ -147,6 +151,8 @@ std::string badguykind_to_string(BadGuyKind kind)
     case BAD_WINGLING:
       return "wingling";
       break;
+    case BAD_WALKINGTREE:
+      return "walkingtree";
     default:
       return "snowball";
     }
@@ -291,6 +297,13 @@ BadGuy::activate(Direction activation_dir)
     physic.set_velocity(dirsign * WINGLING_FLY_SPEED, 0);
     physic.enable_gravity(false);
     set_sprite(img_wingling_left, img_wingling_left);
+  } else if (kind == BAD_WALKINGTREE) {
+    // TODO: why isn't the height/width being set properly in set_sprite?
+    physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0);
+    mode = BGM_BIG;
+    set_sprite(img_walkingtree_left, img_walkingtree_left);
+    base.width = 66;
+    base.height = 66;
   }
 
   base.x = start_position.x;
@@ -818,6 +831,41 @@ BadGuy::action_wingling(double elapsed_time)
   // TODO: Winglings should be removed after flying off the screen
 }
 
+void
+BadGuy::action_walkingtree(double elapsed_time)
+{
+  Player& tux = *World::current()->get_tux();
+  Direction v_dir = physic.get_velocity_x() < 0 ? LEFT : RIGHT;
+
+  if (dying == DYING_NOT)
+    check_horizontal_bump();
+
+  fall();
+
+  if (mode == BGM_BIG)
+  {
+    if ((tux.base.x + tux.base.width/2 > base.x + base.width/2) && v_dir == LEFT)
+    {
+      dir = RIGHT;
+      physic.set_velocity_x(-physic.get_velocity_x());
+    }
+    else if ((tux.base.x + tux.base.width/2 < base.x + base.width/2) && v_dir == RIGHT)
+    {
+      dir = LEFT;
+      physic.set_velocity_x(-physic.get_velocity_x());
+    }
+  }
+  
+
+  physic.apply(elapsed_time, base.x, base.y);
+  if (dying != DYING_FALLING)
+    collision_swept_object_map(&old_base,&base);
+
+  // Handle dying timer:
+  if (dying == DYING_SQUISHED && !timer.check())
+    remove_me();
+}
+
 
 void
 BadGuy::action(float elapsed_time)
@@ -923,6 +971,10 @@ BadGuy::action(float elapsed_time)
       action_wingling(elapsed_time);
       break;
 
+    case BAD_WALKINGTREE:
+      action_walkingtree(elapsed_time);
+      break;
+
     default:
       break;
     }
@@ -944,7 +996,10 @@ BadGuy::draw(Camera& viewport, int)
     }
 
   Sprite* sprite = (dir == LEFT) ? sprite_left : sprite_right;
-  sprite->draw(viewport.world2screen(Vector(base.x, base.y)));
+  if(dying == DYING_FALLING && physic.get_velocity_y() < 0)
+    sprite->draw(viewport.world2screen(Vector(base.x, base.y)), SD_VERTICAL_FLIP);
+  else
+    sprite->draw(viewport.world2screen(Vector(base.x, base.y)));
 
   if (debug_mode)
     fillrect(base.x - scroll_x, base.y - scroll_y, base.width, base.height, 75,0,75, 150);
@@ -1025,7 +1080,7 @@ BadGuy::squish(Player* player)
     
   if(kind == BAD_MRBOMB) {
     // mrbomb transforms into a bomb now
-    explode();
+    explode(false);
     
     make_player_jump(player);
     World::current()->add_score(Vector(base.x, base.y),
@@ -1102,9 +1157,25 @@ BadGuy::squish(Player* player)
   } else if(kind == BAD_WINGLING) {
     squish_me(player);
     set_sprite(img_wingling_left, img_wingling_left);
+  } else if(kind == BAD_WALKINGTREE) {
+    if (mode == BGM_BIG)
+    {
+      set_sprite(img_walkingtree_left_small, img_walkingtree_left_small);
+      physic.set_velocity_x(physic.get_velocity_x() * 2.0f);
+      // XXX magic number: 66 is BGM_BIG height
+
+      make_player_jump(player);
+      base.y += 66 - base.height;
+             
+      World::current()->add_score(Vector(base.x, base.y),
+                                25 * player_status.score_multiplier);
+      player_status.score_multiplier++;
+
+      mode = BGM_SMALL;
+    }
+    else
+      squish_me(player);
   }
-    
-  
 }
 
 void
@@ -1135,9 +1206,15 @@ BadGuy::kill_me(int score)
 }
 
 void
-BadGuy::explode()
+BadGuy::explode(bool right_way)
 {
-  World::current()->add_bad_guy(base.x, base.y, BAD_BOMB);
+  BadGuy *badguy = World::current()->add_bad_guy(base.x, base.y, BAD_BOMB);
+  if(right_way)
+    {
+    badguy->timer.start(0);
+    badguy->mode = BOMB_TICKING;
+    }
+
   remove_me();
 }
 
@@ -1208,7 +1285,7 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
         if (pbad_c->kind == BAD_MRBOMB)
         {
           // mrbomb transforms into a bomb now
-          pbad_c->explode();
+          pbad_c->explode(true);
           return;
         }
         else if (pbad_c->kind != BAD_MRBOMB)
@@ -1223,7 +1300,7 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
         if (pbad_c->kind == BAD_MRBOMB)
         {
           // mrbomb transforms into a bomb now
-          pbad_c->explode();
+          pbad_c->explode(false);
           return;
         }
         else
@@ -1353,6 +1430,8 @@ void load_badguy_gfx()
   img_snowball_squished_left = sprite_manager->load("snowball-squished-left");
   img_snowball_squished_right = sprite_manager->load("snowball-squished-right");
   img_wingling_left = sprite_manager->load("wingling-left");
+  img_walkingtree_left = sprite_manager->load("walkingtree-left");
+  img_walkingtree_left_small = sprite_manager->load("walkingtree-left-small");
 }
 
 void free_badguy_gfx()