projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qmax patch to fix bug #0000389 - colors in infoblocks
[supertux.git]
/
src
/
badguy
/
stumpy.cpp
diff --git
a/src/badguy/stumpy.cpp
b/src/badguy/stumpy.cpp
index
2cac026
..
73dfc6b
100644
(file)
--- a/
src/badguy/stumpy.cpp
+++ b/
src/badguy/stumpy.cpp
@@
-74,7
+74,7
@@
Stumpy::active_update(float elapsed_time)
switch (mystate) {
case STATE_INVINCIBLE:
if (invincible_timer.check()) {
switch (mystate) {
case STATE_INVINCIBLE:
if (invincible_timer.check()) {
- mystate = STATE_NORMAL;
+
mystate = STATE_NORMAL;
WalkingBadguy::initialize();
}
BadGuy::active_update(elapsed_time);
WalkingBadguy::initialize();
}
BadGuy::active_update(elapsed_time);
@@
-149,10
+149,10
@@
Stumpy::collision_badguy(BadGuy& badguy, const CollisionHit& hit)
switch (mystate) {
case STATE_INVINCIBLE:
if(hit.top || hit.bottom) {
switch (mystate) {
case STATE_INVINCIBLE:
if(hit.top || hit.bottom) {
- physic.set_velocity_y(0);
+
physic.set_velocity_y(0);
}
if(hit.left || hit.right) {
}
if(hit.left || hit.right) {
- physic.set_velocity_x(0);
+
physic.set_velocity_x(0);
}
return CONTINUE;
break;
}
return CONTINUE;
break;