projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
729ab54
)
Prevent livefire from wakeing from sleep while in the process of being extinguished
author
LMH
<lmh.0013@gmail.com>
Sun, 8 Sep 2013 06:51:37 +0000
(20:51 -1000)
committer
Tobias Markus
<tobbi@mozilla-uk.org>
Sat, 26 Oct 2013 16:45:22 +0000
(18:45 +0200)
src/badguy/livefire.cpp
patch
|
blob
|
history
diff --git
a/src/badguy/livefire.cpp
b/src/badguy/livefire.cpp
index
b627c49
..
1fa5cba
100644
(file)
--- a/
src/badguy/livefire.cpp
+++ b/
src/badguy/livefire.cpp
@@
-68,7
+68,7
@@
LiveFire::active_update(float elapsed_time) {
return;
}
- if(state == STATE_SLEEPING) {
+ if(state == STATE_SLEEPING
&& get_group() == COLGROUP_MOVING
) {
Player* player = this->get_nearest_player();
if (player) {