- fix a bunch of msvc warnings (mostly assigning double constants to float variables)

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

diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp
index 0483bb1..123e4aa 100644 (file)
--- a/src/badguy/dispenser.cpp
+++ b/src/badguy/dispenser.cpp
@@ -36,6 +36,7 @@ Dispenser::Dispenser(const lisp::Lisp& reader)
   reader.get("cycle", cycle);
   reader.get("badguy", badguy);
   if (badguy == "mrrocket") {
+     if (start_dir == AUTO) log_warning << "Setting a Dispenser's direction to AUTO is no good idea" << std::endl;
      sprite->set_action(dir == LEFT ? "working-left" : "working-right");
   }
   else {sprite->set_action("dropper");}
@@ -59,18 +60,28 @@ Dispenser::write(lisp::Writer& writer)
 void
 Dispenser::activate()
 {
+   if(frozen)
+     return;
    dispense_timer.start(cycle, true);
    launch_badguy();
 }
 
+void
+Dispenser::deactivate()
+{
+   dispense_timer.stop();
+}
+
+//TODO: Add launching velocity to certain badguys
 bool
-Dispenser::collision_squished(Player& player)
+Dispenser::collision_squished(GameObject& object)
 {
   //TODO: Should it act like a normal tile when killed?
   sprite->set_action(dir == LEFT ? "broken-left" : "broken-right");
   dispense_timer.start(0);
-  player.bounce(*this);
-  kill_squished(player);
+  Player* player = dynamic_cast<Player*>(&object);
+  if (player) player->bounce(*this);
+  kill_squished(object);
   return true;
 }
 
@@ -82,7 +93,6 @@ Dispenser::active_update(float )
   }
 }
 
-//TODO: Add launching velocity to certain badguys
 //      Add themed randomizer
 void
 Dispenser::launch_badguy()
@@ -121,4 +131,23 @@ Dispenser::launch_badguy()
   }
 }
 
+void
+Dispenser::freeze()
+{
+  BadGuy::freeze();
+  dispense_timer.stop();
+}
+
+void
+Dispenser::unfreeze()
+{
+  BadGuy::unfreeze();
+  activate();
+}
+
+bool
+Dispenser::is_freezable() const
+{
+  return true;
+}
 IMPLEMENT_FACTORY(Dispenser, "dispenser")