projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Revert breaking changes from last revision
[supertux.git]
/
src
/
badguy
/
angrystone.cpp
diff --git
a/src/badguy/angrystone.cpp
b/src/badguy/angrystone.cpp
index
b6defc4
..
a45692d
100644
(file)
--- a/
src/badguy/angrystone.cpp
+++ b/
src/badguy/angrystone.cpp
@@
-20,7
+20,7
@@
#include "sprite/sprite.hpp"
#include "supertux/object_factory.hpp"
#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 CHARGE_TIME = .5;
static const float ATTACK_TIME = 1;
@@
-132,8
+132,8
@@
AngryStone::active_update(float elapsed_time) {
timer.start(ATTACK_TIME);
state = ATTACKING;
physic.enable_gravity(false);
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;
}
oldWallDirection.x = 0;
oldWallDirection.y = 0;
}