X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fangrystone.cpp;h=d44f9d8e78e0fbdb5c515cc9295e4a61baa8c1e7;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=010230c194632df9f9f01b4c2e2a050a47c26937;hpb=36afad72b6c66d4619372892f589a4131afed638;p=supertux.git

diff --git a/src/badguy/angrystone.cpp b/src/badguy/angrystone.cpp
index 010230c19..d44f9d8e7 100644
--- a/src/badguy/angrystone.cpp
+++ b/src/badguy/angrystone.cpp
@@ -1,7 +1,7 @@
 //  $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
@@ -31,6 +31,10 @@ static const float RECOVER_TIME = .5;
 AngryStone::AngryStone(const lisp::Lisp& reader)
 	: BadGuy(reader, "images/creatures/angrystone/angrystone.sprite"), state(IDLE)
 {
+  physic.set_velocity_x(0);
+  physic.set_velocity_y(0);
+  physic.enable_gravity(true);
+  sprite->set_action("idle");
 }
 
 void
@@ -45,18 +49,13 @@ AngryStone::write(lisp::Writer& writer)
 }
 
 void
-AngryStone::activate()
-{
-  physic.set_velocity_x(0);
-  physic.set_velocity_y(0);
-  physic.enable_gravity(true);
-  sprite->set_action("idle");
-}
-
-HitResponse
-AngryStone::collision_solid(GameObject& , const CollisionHit& hit)
+AngryStone::collision_solid(const CollisionHit& hit)
 {
-  if ((state == ATTACKING) && (hit.normal.x == -attackDirection.x) && (hit.normal.y == attackDirection.y)) {
+  // TODO
+  (void) hit;
+#if 0
+  if ((state == ATTACKING) &&
+      (hit.normal.x == -attackDirection.x) && (hit.normal.y == attackDirection.y)) {
     state = IDLE;
     sprite->set_action("idle");
     physic.set_velocity_x(0);
@@ -65,8 +64,7 @@ AngryStone::collision_solid(GameObject& , const CollisionHit& hit)
     oldWallDirection.x = attackDirection.x;
     oldWallDirection.y = attackDirection.y;
   }
-
-  return CONTINUE;
+#endif
 }
 
 void
@@ -86,7 +84,7 @@ AngryStone::collision_badguy(BadGuy& badguy, const CollisionHit& )
   return FORCE_MOVE;
 }
 
-void 
+void
 AngryStone::active_update(float elapsed_time) {
   BadGuy::active_update(elapsed_time);