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 84f7e2a..953a321 100644 (file)
--- a/src/badguy/dispenser.cpp
+++ b/src/badguy/dispenser.cpp
@@ -2,16 +2,18 @@
 
 #include "dispenser.h"
 #include "badguy/bouncing_snowball.h"
+#include "badguy/snowball.h"
 
-#define DISPENSE_TIME 3
 
 Dispenser::Dispenser(LispReader& 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);
   bbox.set_size(32, 32);
-  sprite = sprite_manager->create("snowball");
+  sprite = sprite_manager->create("dispenser");
+  sprite->set_action("working");
 }
 
 void
@@ -21,6 +23,7 @@ Dispenser::write(LispWriter& writer)
 
   writer.write_float("x", get_pos().x);
   writer.write_float("y", get_pos().y);
+  writer.write_float("cycle", cycle);
   writer.write_string("badguy", badguy);
 
   writer.end_list("dispenser");
@@ -28,23 +31,26 @@ 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));
+      launch_badguy();
    }
 }
 
@@ -61,3 +67,22 @@ Dispenser::collision_solid(GameObject& , const CollisionHit& hit)
 
   return CONTINUE;
 }
+
+//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()
+{
+   //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));
+    else if (badguy == "bouncingsnowball")
+      Sector::current()->add_object(new BouncingSnowball(get_pos().x-2, get_pos().y, dir));
+    else if (badguy == "random")
+      {}
+   }
+}