X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.cpp;h=f3445b3f7c921bd9626f27ab6622b94fdf9e1a6d;hb=2fd963388c2dae6a30f82c99b679a73e8bc5917d;hp=953a3213794bcae020c94109992a3f8f9c5e7bc4;hpb=55a19b5e43db960fc04773eb7f22edd86eac0e6c;p=supertux.git

diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp
index 953a32137..f3445b3f7 100644
--- a/src/badguy/dispenser.cpp
+++ b/src/badguy/dispenser.cpp
@@ -3,26 +3,27 @@
 #include "dispenser.h"
 #include "badguy/bouncing_snowball.h"
 #include "badguy/snowball.h"
+#include "badguy/mrbomb.h"
+#include "badguy/mriceblock.h"
 
-
-Dispenser::Dispenser(LispReader& reader)
+Dispenser::Dispenser(const lisp::Lisp& reader)
 {
-  reader.read_float("x", start_position.x);
-  reader.read_float("y", start_position.y);
-  reader.read_float("cycle", cycle);
-  reader.read_string("badguy", badguy);
+  reader.get("x", start_position.x);
+  reader.get("y", start_position.y);
+  reader.get("cycle", cycle);
+  reader.get("badguy", badguy);
   bbox.set_size(32, 32);
   sprite = sprite_manager->create("dispenser");
   sprite->set_action("working");
 }
 
 void
-Dispenser::write(LispWriter& writer)
+Dispenser::write(lisp::Writer& writer)
 {
   writer.start_list("dispenser");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
   writer.write_float("cycle", cycle);
   writer.write_string("badguy", badguy);
 
@@ -49,9 +50,9 @@ Dispenser::collision_squished(Player& player)
 void
 Dispenser::active_action(float )
 {
-   if (dispense_timer.check()) {
-      launch_badguy();
-   }
+  if (dispense_timer.check()) {
+    launch_badguy();
+  }
 }
 
 HitResponse
@@ -69,20 +70,25 @@ 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
+//      Stop dispensing when game is paused (timer related problem)
 //      Lots-O-Stuff (tm)
 void
 Dispenser::launch_badguy()
 {
-   //FIXME: Does is_offscreen() work right here?
-   if (!is_offscreen()) {
+  //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, dir));
+      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")
-      {}
-   }
+    {}
+  }
 }
+