projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
95fbbff
)
Haywire not moving when jumping on it after freezing
author
Tobias Markus
<tobbi@mozilla-uk.org>
Sun, 13 Oct 2013 12:14:29 +0000
(14:14 +0200)
committer
Tobias Markus
<tobbi@mozilla-uk.org>
Sat, 26 Oct 2013 16:45:25 +0000
(18:45 +0200)
src/badguy/haywire.cpp
patch
|
blob
|
history
diff --git
a/src/badguy/haywire.cpp
b/src/badguy/haywire.cpp
index
b886b14
..
97d1ead
100644
(file)
--- a/
src/badguy/haywire.cpp
+++ b/
src/badguy/haywire.cpp
@@
-81,6
+81,10
@@
Haywire::collision_squished(GameObject& object)
player->bounce (*this);
return true;
}
+
+ if(WalkingBadguy::is_frozen()) {
+ WalkingBadguy::unfreeze();
+ }
if (!is_exploding) {
set_action ((dir == LEFT) ? "ticking-left" : "ticking-right", /* loops = */ -1);