updated dispenser -- can summon mriceblock, snowball, bouncing_snowball and mrbomb now

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

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index cef3304..b075dd1 100644 (file)
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -25,9 +25,9 @@ BadGuy::draw(DrawingContext& context)
   if(state == STATE_INIT || state == STATE_INACTIVE)
     return;
   if(state == STATE_FALLING) {
-      sprite->draw(context, get_pos(), LAYER_OBJECTS, VERTICAL_FLIP);
+    sprite->draw(context, get_pos(), LAYER_OBJECTS, VERTICAL_FLIP);
   } else {
-      sprite->draw(context, get_pos(), LAYER_OBJECTS);
+    sprite->draw(context, get_pos(), LAYER_OBJECTS);
   }
 }
 
@@ -81,7 +81,7 @@ BadGuy::active_action(float elapsed_time)
 }
 
 void
-BadGuy::inactive_action(float elapsed_time)
+BadGuy::inactive_action(float )
 {
 }
 
@@ -118,7 +118,7 @@ BadGuy::collision(GameObject& other, const CollisionHit& hit)
 }
 
 HitResponse
-BadGuy::collision_solid(GameObject& other, const CollisionHit& hit)
+BadGuy::collision_solid(GameObject& , const CollisionHit& )
 {
   return FORCE_MOVE;
 }
@@ -139,13 +139,13 @@ BadGuy::collision_player(Player& player, const CollisionHit& hit)
 }
 
 HitResponse
-BadGuy::collision_badguy(BadGuy& other, const CollisionHit& hit)
+BadGuy::collision_badguy(BadGuy& , const CollisionHit& )
 {
   return FORCE_MOVE;
 }
 
 bool
-BadGuy::collision_squished(Player& player)
+BadGuy::collision_squished(Player& )
 {
   return false;
 }
@@ -194,6 +194,9 @@ BadGuy::set_state(State state)
       }
       flags |= FLAG_NO_COLLDET;
       break;
+    case STATE_FALLING:
+      flags |= FLAG_NO_COLLDET;
+      break;
     default:
       break;
   }