fixed a couple of nolok's minor bugs

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

diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp
index 1f62e61..953a321 100644 (file)
--- a/src/badguy/dispenser.cpp
+++ b/src/badguy/dispenser.cpp
@@ -12,8 +12,8 @@ Dispenser::Dispenser(LispReader& reader)
   reader.read_float("cycle", cycle);
   reader.read_string("badguy", badguy);
   bbox.set_size(32, 32);
-  //FIXME: Create dispenser sprite
-  sprite = sprite_manager->create("snowball");
+  sprite = sprite_manager->create("dispenser");
+  sprite->set_action("working");
 }
 
 void
@@ -39,7 +39,9 @@ Dispenser::activate()
 bool
 Dispenser::collision_squished(Player& player)
 {
-  remove_me();
+  //FIXME: Should act like a normal tile when killed
+  sprite->set_action("broken");
+  dispense_timer.start(0);
   player.bounce(*this);
   return true;
 }
@@ -69,6 +71,7 @@ Dispenser::collision_solid(GameObject& , const CollisionHit& hit)
 //TODO: Add launching velocity to badguys
 //      Add more badguys and randomizer
 //      Clean up stuff I copied without understanding what it does :)
+//      Stop dispensing when game is paused
 //      Lots-O-Stuff (tm)
 void
 Dispenser::launch_badguy()
@@ -78,7 +81,7 @@ Dispenser::launch_badguy()
     if (badguy == "snowball")
       Sector::current()->add_object(new SnowBall(get_pos().x-2, get_pos().y));
     else if (badguy == "bouncingsnowball")
-      Sector::current()->add_object(new BouncingSnowball(get_pos().x-2, get_pos().y));
+      Sector::current()->add_object(new BouncingSnowball(get_pos().x-2, get_pos().y, dir));
     else if (badguy == "random")
       {}
    }