Fixed trailing whitespaces in all(?) source files of supertux, also fixed some svn...

[supertux.git] / src / badguy / badguy.cpp

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index c9d42cd..fcf3b1f 100644 (file)
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -62,7 +62,7 @@ BadGuy::BadGuy(const lisp::Lisp& reader, const std::string& sprite_name, int lay
   reader.get("direction", dir_str);
   start_dir = str2dir( dir_str );
   dir = start_dir;
-  
+
   reader.get("dead-script", dead_script);
   draw_dead_script_hint = (dead_script != "");
 
@@ -87,7 +87,7 @@ BadGuy::draw(DrawingContext& context)
     if (draw_dead_script_hint) {
       Vector ppos = Vector(systemRandom.randf(bbox.p1.x+8, bbox.p2.x-8), bbox.p2.y);
       Vector pspeed = Vector(0, -100);
-      Sector::current()->add_object(new Particles(ppos, 44, 46, pspeed, Vector(0,0), 1, Color(.6, .2, .2), 3, .1, LAYER_OBJECTS+1));
+      Sector::current()->add_object(new Particles(ppos, 44, 46, pspeed, Vector(0,0), 1, Color(.6f, .2f, .2f), 3, .1f, LAYER_OBJECTS+1));
     }
   }
 }
@@ -176,7 +176,7 @@ BadGuy::collision_tile(uint32_t tile_attributes)
   if(tile_attributes & Tile::HURTS) {
     if (tile_attributes & Tile::FIRE) {
       if (is_flammable()) ignite();
-    } 
+    }
     else if (tile_attributes & Tile::ICE) {
       if (is_freezable()) freeze();
     }
@@ -283,7 +283,7 @@ BadGuy::collision_bullet(Bullet& bullet, const CollisionHit& hit)
       bullet.ricochet(*this, hit);
       return FORCE_MOVE;
     }
-  } 
+  }
   else if (is_ignited()) {
     if(bullet.get_type() == ICE_BONUS) {
       // ice bullets extinguish ignited badguys
@@ -391,9 +391,9 @@ BadGuy::is_offscreen()
   float scroll_y = Sector::current()->camera->get_translation().y;
 
   if(bbox.p2.x < scroll_x - X_OFFSCREEN_DISTANCE
-      || bbox.p1.x > scroll_x + X_OFFSCREEN_DISTANCE
+      || bbox.p1.x > scroll_x + X_OFFSCREEN_DISTANCE + SCREEN_WIDTH
       || bbox.p2.y < scroll_y - Y_OFFSCREEN_DISTANCE
-      || bbox.p1.y > scroll_y + Y_OFFSCREEN_DISTANCE)
+      || bbox.p1.y > scroll_y + Y_OFFSCREEN_DISTANCE + SCREEN_HEIGHT)
     return true;
 
   return false;
@@ -412,7 +412,7 @@ BadGuy::try_activate()
   if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE &&
       start_position.x < scroll_x - bbox.get_width() &&
       start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
-      start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE) {
+      start_position.y < scroll_y + SCREEN_HEIGHT + Y_OFFSCREEN_DISTANCE) {
     if (start_dir != AUTO) dir = start_dir; else dir = RIGHT;
     set_state(STATE_ACTIVE);
     activate();
@@ -420,13 +420,13 @@ BadGuy::try_activate()
   } else if (start_position.x > scroll_x +  SCREEN_WIDTH &&
       start_position.x < scroll_x + SCREEN_WIDTH + X_OFFSCREEN_DISTANCE &&
       start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
-      start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE) {
+      start_position.y < scroll_y + SCREEN_HEIGHT + Y_OFFSCREEN_DISTANCE) {
     if (start_dir != AUTO) dir = start_dir; else dir = LEFT;
     set_state(STATE_ACTIVE);
     activate();
   //Badguy over or under screen
   } else if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE &&
-       start_position.x < scroll_x + X_OFFSCREEN_DISTANCE &&
+       start_position.x < scroll_x + SCREEN_WIDTH + X_OFFSCREEN_DISTANCE &&
        ((start_position.y > scroll_y + SCREEN_HEIGHT &&
          start_position.y < scroll_y + SCREEN_HEIGHT + Y_OFFSCREEN_DISTANCE) ||
         (start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
@@ -445,9 +445,9 @@ BadGuy::try_activate()
      activate();
   } else if(state == STATE_INIT
       && start_position.x > scroll_x - X_OFFSCREEN_DISTANCE
-      && start_position.x < scroll_x + X_OFFSCREEN_DISTANCE
+      && start_position.x < scroll_x + X_OFFSCREEN_DISTANCE + SCREEN_WIDTH
       && start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE
-      && start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE) {
+      && start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE + SCREEN_HEIGHT ) {
     if (start_dir != AUTO) {
       dir = start_dir;
     } else {
@@ -545,26 +545,25 @@ BadGuy::is_frozen() const
   return frozen;
 }
 
-void 
-BadGuy::ignite() 
+void
+BadGuy::ignite()
 {
   kill_fall();
 }
 
-void 
-BadGuy::extinguish() 
+void
+BadGuy::extinguish()
 {
 }
 
-bool 
-BadGuy::is_flammable() const 
+bool
+BadGuy::is_flammable() const
 {
   return true;
 }
 
-bool 
-BadGuy::is_ignited() const 
+bool
+BadGuy::is_ignited() const
 {
   return ignited;
 }
-