Badguys that die will still trigger collisions during the current frame (closes issue 50)

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

diff --git a/src/badguy/darttrap.cpp b/src/badguy/darttrap.cpp
index 9bb2eaa..be6cc1d 100644 (file)
--- a/src/badguy/darttrap.cpp
+++ b/src/badguy/darttrap.cpp
@@ -1,7 +1,7 @@
 //  $Id$
 //
 //  DartTrap - Shoots a Dart at regular intervals
-//  Copyright (C) 2006 Christoph Sommer <supertux@2006.expires.deltadevelopment.de>
+//  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
 #include "dart.hpp"
 
 namespace {
-  const float MUZZLE_Y = 28; /**< [px] muzzle y-offset from top */
+  const float MUZZLE_Y = 25; /**< [px] muzzle y-offset from top */
 }
 
 DartTrap::DartTrap(const lisp::Lisp& reader)
@@ -56,7 +56,7 @@ DartTrap::activate()
   sprite->set_action(dir == LEFT ? "idle-left" : "idle-right");
   set_group(COLGROUP_DISABLED);
 
-  if (initial_delay == 0) initial_delay = 0.1;
+  if (initial_delay == 0) initial_delay = 0.1f;
   fire_timer.start(initial_delay);
 }