fix tiles being 1 pixel off their correct position
[supertux.git] / src / badguy.cpp
index 67389d5..87ef1b7 100644 (file)
 #include "globals.h"
 #include "defines.h"
 #include "badguy.h"
-#include "scene.h"
-#include "screen.h"
-#include "world.h"
 #include "tile.h"
 #include "resources.h"
 #include "sprite_manager.h"
-#include "gameloop.h"
-#include "display_manager.h"
-#include "lispwriter.h"
+#include "world.h"
 #include "camera.h"
+#include "lispwriter.h"
+#include "level.h"
 
 Sprite* img_mriceblock_flat_left;
 Sprite* img_mriceblock_flat_right;
@@ -75,6 +72,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 +102,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,17 +148,16 @@ std::string badguykind_to_string(BadGuyKind kind)
     case BAD_WINGLING:
       return "wingling";
       break;
+    case BAD_WALKINGTREE:
+      return "walkingtree";
     default:
       return "snowball";
     }
 }
 
-BadGuy::BadGuy(DisplayManager& display_manager, BadGuyKind kind_,
-    LispReader& lispreader)
+BadGuy::BadGuy(BadGuyKind kind_, LispReader& lispreader)
   : removable(false), squishcount(0)
 {
-  display_manager.add_drawable(this, LAYER_OBJECTS);
-
   lispreader.read_float("x", &start_position.x);
   lispreader.read_float("y", &start_position.y);
 
@@ -169,11 +169,9 @@ BadGuy::BadGuy(DisplayManager& display_manager, BadGuyKind kind_,
   init();
 }
 
-BadGuy::BadGuy(DisplayManager& display_manager, BadGuyKind kind_,
-    float x, float y)
+BadGuy::BadGuy(BadGuyKind kind_, float x, float y)
+  : removable(false), squishcount(0)
 {
-  display_manager.add_drawable(this, LAYER_OBJECTS);
-
   start_position.x = x;
   start_position.y = y;
   stay_on_platform = false;
@@ -201,6 +199,7 @@ BadGuy::init()
   dir      = LEFT;
   seen     = false;
   animation_offset = 0;
+  target.x = target.y = -1;
   sprite_left = sprite_right = 0;
   physic.reset();
   frozen_timer.init(true);
@@ -215,9 +214,16 @@ BadGuy::init()
         --base.y;
     }
 
-  // just activate the badguy, since he might be on screen already. If not he
-  // gets deactivated anyway
-  activate(LEFT);
+  if(World::current()->camera) {
+    Vector scroll = World::current()->camera->get_translation();
+
+    if(start_position.x > scroll.x - X_OFFSCREEN_DISTANCE &&
+        start_position.x < scroll.x + screen->w + X_OFFSCREEN_DISTANCE &&
+        start_position.y > scroll.y - Y_OFFSCREEN_DISTANCE &&
+        start_position.y < scroll.y + screen->h + Y_OFFSCREEN_DISTANCE) {
+      activate(LEFT);
+    }
+  }
 }
 
 void
@@ -237,6 +243,7 @@ BadGuy::activate(Direction activation_dir)
 {
   mode     = NORMAL;
   animation_offset = 0;
+  target.x = target.y = -1;
   physic.reset();
   frozen_timer.init(true);
   timer.init(true);
@@ -282,6 +289,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;
@@ -640,8 +654,9 @@ BadGuy::action_fish(double elapsed_time)
   static const int WAITTIME = 1000;
     
   // go in wait mode when back in water
-  if(dying == DYING_NOT && gettile(base.x, base.y+ base.height)->water
-        && physic.get_velocity_y() <= 0 && mode == NORMAL)
+  if(dying == DYING_NOT 
+      && gettile(base.x, base.y+ base.height)->attributes & Tile::WATER
+      && physic.get_velocity_y() <= 0 && mode == NORMAL)
     {
       mode = FISH_WAIT;
       set_sprite(0, 0);
@@ -784,11 +799,19 @@ BadGuy::action_wingling(double elapsed_time)
   else
   {
     Player& tux = *World::current()->get_tux();
+    int dirsign = physic.get_velocity_x() < 0 ? -1 : 1;
 
-    if (fabsf(tux.base.x - base.x) < 200 && base.y < tux.base.y && tux.dying == DYING_NOT)
-      physic.set_velocity(-2.0f, -2.0f);
-    else
-      physic.set_velocity(-WINGLING_FLY_SPEED, 0);
+    if (fabsf(tux.base.x - base.x) < 150 && base.y < tux.base.y && tux.dying == DYING_NOT)
+    {
+      if (target.x < 0 && target.y < 0)
+      {
+        target.x = tux.base.x;
+        target.y = tux.base.y;
+        physic.set_velocity(dirsign * 1.5f, -2.25f);
+      }
+    }
+    else if (base.y >= target.y - 16)
+      physic.set_velocity(dirsign * WINGLING_FLY_SPEED, 0);
   }
 
   physic.apply(elapsed_time, base.x, base.y);
@@ -796,9 +819,45 @@ BadGuy::action_wingling(double elapsed_time)
 
   // Handle dying timer:
   if (dying == DYING_SQUISHED && !timer.check())
-    remove_me();                                  
+    remove_me();
+
+  // 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)
@@ -904,30 +963,34 @@ BadGuy::action(float elapsed_time)
       action_wingling(elapsed_time);
       break;
 
+    case BAD_WALKINGTREE:
+      action_walkingtree(elapsed_time);
+      break;
+
     default:
       break;
     }
 }
 
 void
-BadGuy::draw(Camera& viewport, int)
+BadGuy::draw(DrawingContext& context)
 {
-  float scroll_x = viewport.get_translation().x;
-  float scroll_y = viewport.get_translation().y;
-
-  // Don't try to draw stuff that is outside of the screen
-  if(base.x <= scroll_x - base.width || base.x >= scroll_x + screen->w)
+  Sprite* sprite = (dir == LEFT) ? sprite_left : sprite_right;
+  if(sprite == 0)
     return;
-  
-  if(sprite_left == 0 || sprite_right == 0)
-    {
-      return;
-    }
 
+  sprite->draw(context, Vector(base.x, base.y), LAYER_OBJECTS);
+#if 0
   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)));
+#endif
 
-  if (debug_mode)
+  float scroll_x = context.get_translation().x;
+  float scroll_y = context.get_translation().y;
+  if(debug_mode)
     fillrect(base.x - scroll_x, base.y - scroll_y, base.width, base.height, 75,0,75, 150);
 }
 
@@ -1006,7 +1069,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),
@@ -1083,9 +1146,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
@@ -1116,9 +1195,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();
 }
 
@@ -1189,7 +1274,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)
@@ -1204,7 +1289,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
@@ -1334,6 +1419,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()