projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Don't kill badguys twice when hitting spike after falling after being squished
[supertux.git]
/
src
/
badguy
/
badguy.cpp
diff --git
a/src/badguy/badguy.cpp
b/src/badguy/badguy.cpp
index
46c0d70
..
8cbec1d
100644
(file)
--- a/
src/badguy/badguy.cpp
+++ b/
src/badguy/badguy.cpp
@@
-219,6
+219,9
@@
BadGuy::inactive_update(float )
void
BadGuy::collision_tile(uint32_t tile_attributes)
{
+ // Don't kill badguys that have already been killed
+ if (!is_active()) return;
+
if(tile_attributes & Tile::HURTS) {
if (tile_attributes & Tile::FIRE) {
if (is_flammable()) ignite();