- 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 b06c18d..123e4aa 100644 (file)
--- a/src/badguy/dispenser.cpp
+++ b/src/badguy/dispenser.cpp
@@ -33,16 +33,10 @@
 Dispenser::Dispenser(const lisp::Lisp& reader)
        : BadGuy(reader, "images/creatures/dispenser/dispenser.sprite")
 {
-  set_direction = false;
-  reader.get("direction", direction);
-  if( direction != "auto" && direction != ""){
-    set_direction = true;
-    initial_direction = str2dir( direction );
-    dir = str2dir( direction );
-  }
   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");}
@@ -55,7 +49,6 @@ Dispenser::write(lisp::Writer& writer)
 {
   writer.start_list("dispenser");
 
-  writer.write_string("direction", direction);
   writer.write_float("x", start_position.x);
   writer.write_float("y", start_position.y);
   writer.write_float("cycle", cycle);
@@ -66,19 +59,29 @@ 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;
 }
 
@@ -90,14 +93,10 @@ Dispenser::active_update(float )
   }
 }
 
-//TODO: Add launching velocity to certain badguys
 //      Add themed randomizer
 void
 Dispenser::launch_badguy()
 {
-  if( set_direction ){
-    dir = initial_direction;
-  }
   //FIXME: Does is_offscreen() work right here?
   if (!is_offscreen()) {
     if (badguy == "snowball")
@@ -132,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")