projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent livefire from wakeing from sleep while in the process of being extinguished
[supertux.git]
/
src
/
badguy
/
livefire.cpp
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;
}
return;
}
- if(state == STATE_SLEEPING) {
+ if(state == STATE_SLEEPING
&& get_group() == COLGROUP_MOVING
) {
Player* player = this->get_nearest_player();
if (player) {
Player* player = this->get_nearest_player();
if (player) {