X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.cpp;h=33bd1c9b76117d6adb5415e881ea194f2a7b08e6;hb=16ed8c7ce29177a68fbf64d4cfc03739ae75c094;hp=2ff06b83c5d6638abc54ac04968e933fccb23c65;hpb=bb5bf44283e1ca2a3cc306f557cef5dbc8c20a22;p=supertux.git

diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp
index 2ff06b83c..33bd1c9b7 100644
--- a/src/badguy/dispenser.cpp
+++ b/src/badguy/dispenser.cpp
@@ -6,6 +6,7 @@
 #include "badguy/mrbomb.h"
 #include "badguy/mriceblock.h"
 #include "badguy/mrrocket.h"
+#include "badguy/poisonivy.h"
 
 Dispenser::Dispenser(const lisp::Lisp& reader)
 {
@@ -15,7 +16,10 @@ Dispenser::Dispenser(const lisp::Lisp& reader)
   reader.get("badguy", badguy);
   bbox.set_size(32, 32);
   sprite = sprite_manager->create("dispenser");
-  sprite->set_action("working");
+  if (badguy == "mrrocket") {
+     sprite->set_action(dir == LEFT ? "working-left" : "working-right");
+  }
+  else {sprite->set_action("dropper");}
 }
 
 void
@@ -42,7 +46,7 @@ bool
 Dispenser::collision_squished(Player& player)
 {
   //TODO: Should it act like a normal tile when killed?
-  sprite->set_action("broken");
+  sprite->set_action(dir == LEFT ? "broken-left" : "broken-right");
   dispense_timer.start(0);
   player.bounce(*this);
   kill_squished(player);
@@ -58,7 +62,8 @@ Dispenser::active_action(float )
 }
 
 //TODO: Add launching velocity to certain badguys
-//      Add randomizer (themed to match tileset)
+//      Add themed randomizer
+//      Fix initial direction (everyone but MrRocket walks the wrong direction)
 void
 Dispenser::launch_badguy()
 {
@@ -72,10 +77,22 @@ Dispenser::launch_badguy()
       Sector::current()->add_object(new MrBomb(get_pos().x, get_pos().y+32, dir));
     else if (badguy == "mriceblock")
       Sector::current()->add_object(new MrIceBlock(get_pos().x, get_pos().y+32, dir));
-    else if (badguy == "mrrocket")
-      Sector::current()->add_object(new MrRocket(get_pos().x, get_pos().y+32, dir));
+    else if (badguy == "mrrocket") {
+      int offset = (dir == LEFT ? -32 : 32);
+      Sector::current()->add_object(new MrRocket(get_pos().x+offset, get_pos().y, dir));}
+    else if (badguy == "poisonivy")
+      Sector::current()->add_object(new PoisonIvy(get_pos().x, get_pos().y+32, dir));
     else if (badguy == "random")
-    {}
+    {
+      switch (rand()%5)
+      {
+        case 0: Sector::current()->add_object(new SnowBall(get_pos().x, get_pos().y+32, dir)); break;
+        case 1: Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y+32, dir)); break;
+        case 2: Sector::current()->add_object(new MrBomb(get_pos().x, get_pos().y+32, dir)); break;
+        case 3: Sector::current()->add_object(new MrIceBlock(get_pos().x, get_pos().y+32, dir)); break;
+        case 4: Sector::current()->add_object(new PoisonIvy(get_pos().x, get_pos().y+32, dir)); break;
+      }
+    }
   }
 }