X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.cpp;h=0a92074dc7e4746f85a89be4d06b484bcf88b53e;hb=abf179b33deb4040bb583e29207eaf1dd2ee0780;hp=84f7e2a0418d2259becba4561ed6747c39d2de17;hpb=3f1a54cc4a2b8deb8ebb31061a00ffcec5fb3169;p=supertux.git

diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp
index 84f7e2a04..0a92074dc 100644
--- a/src/badguy/dispenser.cpp
+++ b/src/badguy/dispenser.cpp
@@ -2,25 +2,29 @@
 
 #include "dispenser.h"
 #include "badguy/bouncing_snowball.h"
+#include "badguy/snowball.h"
+#include "badguy/mrbomb.h"
+#include "badguy/mriceblock.h"
 
-#define DISPENSE_TIME 3
-
-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_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("snowball");
+  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);
 
   writer.end_list("dispenser");
@@ -28,24 +32,27 @@ Dispenser::write(LispWriter& writer)
 
 void
 Dispenser::activate()
-{
-   dispense_timer.start(DISPENSE_TIME, true);
+{  
+   dispense_timer.start(cycle, true);
+   launch_badguy();
 }
 
 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()) {
-      Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y));
-   }
+  if (dispense_timer.check()) {
+    launch_badguy();
+  }
 }
 
 HitResponse
@@ -61,3 +68,28 @@ Dispenser::collision_solid(GameObject& , const CollisionHit& hit)
 
   return CONTINUE;
 }
+
+//TODO: Add launching velocity to badguys
+//      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()
+{
+  //FIXME: Does is_offscreen() work right here?
+  if (!is_offscreen()) {
+    if (badguy == "snowball")
+      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, 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")
+    {}
+  }
+}
+
+IMPLEMENT_FACTORY(Dispenser, "dispenser")