fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/badguy/darttrap.cpp b/src/badguy/darttrap.cpp
index 6add158..9bb2eaa 100644 (file)
--- a/src/badguy/darttrap.cpp
+++ b/src/badguy/darttrap.cpp
@@ -26,25 +26,21 @@ namespace {
   const float MUZZLE_Y = 28; /**< [px] muzzle y-offset from top */
 }
 
-DartTrap::DartTrap(const lisp::Lisp& reader) 
-       : BadGuy(reader, "images/creatures/darttrap/darttrap.sprite"), set_direction(true), initial_direction(LEFT), initial_delay(0), fire_delay(2), ammo(-1), state(IDLE)
+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)
 {
-  reader.get("direction", direction);
-  if( direction != "auto" && direction != ""){
-    initial_direction = str2dir( direction );
-  }
   reader.get("initial-delay", initial_delay);
   reader.get("fire-delay", fire_delay);
   reader.get("ammo", ammo);
   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;
 }
 
 void
 DartTrap::write(lisp::Writer& writer)
 {
   writer.start_list("darttrap");
-  writer.write_string("direction", direction);
   writer.write_float("x", start_position.x);
   writer.write_float("y", start_position.y);
   writer.write_float("initial-delay", initial_delay);
@@ -56,15 +52,15 @@ DartTrap::write(lisp::Writer& writer)
 void
 DartTrap::activate()
 {
-  if (set_direction) dir = initial_direction;
   state = IDLE;
   sprite->set_action(dir == LEFT ? "idle-left" : "idle-right");
+  set_group(COLGROUP_DISABLED);
 
   if (initial_delay == 0) initial_delay = 0.1;
   fire_timer.start(initial_delay);
 }
 
-HitResponse 
+HitResponse
 DartTrap::collision_player(Player& , const CollisionHit& )
 {
   return ABORT_MOVE;
@@ -109,4 +105,3 @@ DartTrap::fire()
 }
 
 IMPLEMENT_FACTORY(DartTrap, "darttrap")
-