Removed trailing whitespace from all *.?pp files

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

diff --git a/src/badguy/angrystone.cpp b/src/badguy/angrystone.cpp
index b6defc4..ab3d4c2 100644 (file)
--- a/src/badguy/angrystone.cpp
+++ b/src/badguy/angrystone.cpp
@@ -20,19 +20,20 @@
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 
-static const float SPEED = 240;
+static const float CHARGE_SPEED = 240;
 
 static const float CHARGE_TIME = .5;
 static const float ATTACK_TIME = 1;
 static const float RECOVER_TIME = .5;
 
 AngryStone::AngryStone(const Reader& reader) :
-  BadGuy(reader, "images/creatures/angrystone/angrystone.sprite"), 
+  BadGuy(reader, "images/creatures/angrystone/angrystone.sprite"),
   attackDirection(),
   oldWallDirection(),
   timer(),
   state(IDLE)
 {
+  countMe = false;
   physic.set_velocity_x(0);
   physic.set_velocity_y(0);
   physic.enable_gravity(true);
@@ -132,8 +133,8 @@ AngryStone::active_update(float elapsed_time) {
       timer.start(ATTACK_TIME);
       state = ATTACKING;
       physic.enable_gravity(false);
-      physic.set_velocity_x(SPEED * attackDirection.x);
-      physic.set_velocity_y(SPEED * attackDirection.y);
+      physic.set_velocity_x(CHARGE_SPEED * attackDirection.x);
+      physic.set_velocity_y(CHARGE_SPEED * attackDirection.y);
       oldWallDirection.x = 0;
       oldWallDirection.y = 0;
     }