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

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

diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp
index d8ec812..c2ba901 100644 (file)
--- a/src/badguy/dispenser.cpp
+++ b/src/badguy/dispenser.cpp
@@ -3,6 +3,8 @@
 #include "dispenser.h"
 #include "badguy/bouncing_snowball.h"
 #include "badguy/snowball.h"
+#include "badguy/mrbomb.h"
+#include "badguy/mriceblock.h"
 
 
 Dispenser::Dispenser(LispReader& reader)
@@ -12,8 +14,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,13 +41,15 @@ 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;
 }
 
 void
-Dispenser::active_action(float elapsed_time)
+Dispenser::active_action(float )
 {
    if (dispense_timer.check()) {
       launch_badguy();
@@ -67,8 +71,9 @@ Dispenser::collision_solid(GameObject& , const CollisionHit& hit)
 }
 
 //TODO: Add launching velocity to badguys
-//      Add more badguys and randomizer
+//      Add randomizer
 //      Clean up stuff I copied without understanding what it does :)
+//      Stop dispensing when game is paused (timer related problem)
 //      Lots-O-Stuff (tm)
 void
 Dispenser::launch_badguy()
@@ -76,9 +81,13 @@ Dispenser::launch_badguy()
    //FIXME: Does is_offscreen() work right here?
    if (!is_offscreen()) {
     if (badguy == "snowball")
-      Sector::current()->add_object(new SnowBall(get_pos().x-2, get_pos().y));
+      Sector::current()->add_object(new SnowBall(get_pos().x, get_pos().y, dir));
     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, get_pos().y, dir));
+    else if (badguy == "mrbomb")
+      Sector::current()->add_object(new MrBomb(get_pos().x, get_pos().y, dir));
+    else if (badguy == "mriceblock")
+      Sector::current()->add_object(new MrIceBlock(get_pos().x, get_pos().y, dir));
     else if (badguy == "random")
       {}
    }