Stop backflipping when no longer grown (eg. due to hit).

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

diff --git a/src/badguy/darttrap.cpp b/src/badguy/darttrap.cpp
index be6cc1d..41cc585 100644 (file)
--- a/src/badguy/darttrap.cpp
+++ b/src/badguy/darttrap.cpp
@@ -35,6 +35,9 @@ DartTrap::DartTrap(const lisp::Lisp& reader)
   countMe = false;
   sound_manager->preload("sounds/dartfire.wav");
   if (start_dir == AUTO) log_warning << "Setting a DartTrap's direction to AUTO is no good idea" << std::endl;
+  state = IDLE;
+  set_colgroup_active(COLGROUP_DISABLED);
+  if (initial_delay == 0) initial_delay = 0.1f;
 }
 
 void
@@ -50,13 +53,14 @@ DartTrap::write(lisp::Writer& writer)
 }
 
 void
-DartTrap::activate()
+DartTrap::initialize()
 {
-  state = IDLE;
   sprite->set_action(dir == LEFT ? "idle-left" : "idle-right");
-  set_group(COLGROUP_DISABLED);
+}
 
-  if (initial_delay == 0) initial_delay = 0.1f;
+void
+DartTrap::activate()
+{
   fire_timer.start(initial_delay);
 }