projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix cr/lfs and remove trailing whitespaces...
[supertux.git]
/
src
/
badguy
/
angrystone.cpp
diff --git
a/src/badguy/angrystone.cpp
b/src/badguy/angrystone.cpp
index
bcf6d90
..
865e430
100644
(file)
--- a/
src/badguy/angrystone.cpp
+++ b/
src/badguy/angrystone.cpp
@@
-59,7
+59,7
@@
AngryStone::collision_solid(const CollisionHit& hit)
// TODO
(void) hit;
#if 0
// TODO
(void) hit;
#if 0
- if ((state == ATTACKING) &&
+ if ((state == ATTACKING) &&
(hit.normal.x == -attackDirection.x) && (hit.normal.y == attackDirection.y)) {
state = IDLE;
sprite->set_action("idle");
(hit.normal.x == -attackDirection.x) && (hit.normal.y == attackDirection.y)) {
state = IDLE;
sprite->set_action("idle");
@@
-89,7
+89,7
@@
AngryStone::collision_badguy(BadGuy& badguy, const CollisionHit& )
return FORCE_MOVE;
}
return FORCE_MOVE;
}
-void
+void
AngryStone::active_update(float elapsed_time) {
BadGuy::active_update(elapsed_time);
AngryStone::active_update(float elapsed_time) {
BadGuy::active_update(elapsed_time);