Colors patch from qmax ( + added stat_hdr_color into levelintro.hpp...)

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

diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp
index d7c7b4e..6010b14 100644 (file)
--- a/src/badguy/dispenser.cpp
+++ b/src/badguy/dispenser.cpp
@@ -18,13 +18,14 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
+#include <stdexcept>
 
 #include "dispenser.hpp"
 #include "object/bullet.hpp"
 #include "random_generator.hpp"
 
 Dispenser::Dispenser(const lisp::Lisp& reader)
-       : BadGuy(reader, "images/creatures/dispenser/dispenser.sprite")
+        : BadGuy(reader, "images/creatures/dispenser/dispenser.sprite")
 {
   set_colgroup_active(COLGROUP_MOVING_STATIC);
   sound_manager->preload("sounds/squish.wav");
@@ -42,7 +43,7 @@ Dispenser::Dispenser(const lisp::Lisp& reader)
   if (badguys.size() <= 0)
     throw std::runtime_error("No badguys in dispenser.");
 
-  if (type == "rocket-launcher") {
+  if (type == "rocketlauncher") {
     sprite->set_action(dir == LEFT ? "working-left" : "working-right");
     set_colgroup_active(COLGROUP_MOVING); //if this were COLGROUP_MOVING_STATIC MrRocket would explode on launch.
 
@@ -103,7 +104,7 @@ Dispenser::collision_squished(GameObject& object)
 {
   //Cannon launching MrRocket can be broken by jumping on it
   //other dispencers are not that fragile.
-  if (broken || type != "rocket-launcher") {
+  if (broken || type != "rocketlauncher") {
     return false;
   }
 
@@ -204,7 +205,7 @@ Dispenser::launch_badguy()
       badguy_object = create_badguy_object(badguy, Vector(get_pos().x, get_pos().y+32), launchdir);
     else if (type == "cannon")
       badguy_object = create_badguy_object(badguy, Vector(get_pos().x + (launchdir == LEFT ? -32 : 32), get_pos().y), launchdir);
-    else if (type == "rocket-launcher")
+    else if (type == "rocketlauncher")
       badguy_object = create_badguy_object(badguy, Vector(get_pos().x + (launchdir == LEFT ? -32 : 32), get_pos().y), launchdir);
 
     if (badguy_object)