X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdarttrap.cpp;h=b2e7f55e471b7dd5ea686e2d5b4d5543239f09ad;hb=13c84268f16872f9b442251c4175a3a1a7a7899a;hp=be6cc1d0174a40a50fd6540898bf24f2c8ec9730;hpb=4c676c4c0c70f0efa7f1536b92de01976b1977a0;p=supertux.git

diff --git a/src/badguy/darttrap.cpp b/src/badguy/darttrap.cpp
index be6cc1d01..b2e7f55e4 100644
--- a/src/badguy/darttrap.cpp
+++ b/src/badguy/darttrap.cpp
@@ -27,7 +27,7 @@ namespace {
 }
 
 DartTrap::DartTrap(const lisp::Lisp& reader)
-	: BadGuy(reader, "images/creatures/darttrap/darttrap.sprite", LAYER_TILES-1), initial_delay(0), fire_delay(2), ammo(-1), state(IDLE)
+  : BadGuy(reader, "images/creatures/darttrap/darttrap.sprite", LAYER_TILES-1), initial_delay(0), fire_delay(2), ammo(-1), state(IDLE)
 {
   reader.get("initial-delay", initial_delay);
   reader.get("fire-delay", fire_delay);
@@ -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);
 }