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

[supertux.git] / src / badguy / angrystone.hpp

diff --git a/src/badguy/angrystone.hpp b/src/badguy/angrystone.hpp
index 13a5d28..73466af 100644 (file)
--- a/src/badguy/angrystone.hpp
+++ b/src/badguy/angrystone.hpp
@@ -1,7 +1,7 @@
-//  $Id: angrystone.hpp 2642 2005-06-26 13:38:53Z matzebraun $
-// 
+//  $Id$
+//
 //  AngryStone - A spiked block that charges towards the player
-//  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
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -30,11 +30,13 @@ public:
 
   void activate();
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void active_update(float elapsed_time);
   void kill_fall();
 
+  virtual AngryStone* clone() const { return new AngryStone(*this); }
+
 protected:
   Vector attackDirection;  /**< 1-normalized vector of current attack direction */
   Vector oldWallDirection; /**< if wall was hit during last attack: 1-normalized vector of last attack direction, (0,0) otherwise */
@@ -48,7 +50,7 @@ protected:
     RECOVERING
   };
   AngryStoneState state;
-  
+
 };
 
 #endif