projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fixed check for Block killing Badguy from below
[supertux.git]
/
src
/
object
/
hurting_platform.cpp
diff --git
a/src/object/hurting_platform.cpp
b/src/object/hurting_platform.cpp
index
59cbfdf
..
2c0a010
100644
(file)
--- a/
src/object/hurting_platform.cpp
+++ b/
src/object/hurting_platform.cpp
@@
-38,6
+38,9
@@
HurtingPlatform::collision(GameObject& other, const CollisionHit& )
{
Player* player = dynamic_cast<Player*>(&other);
if (player) {
+ if(player->is_invincible()) {
+ return ABORT_MOVE;
+ }
player->kill(false);
}
BadGuy* badguy = dynamic_cast<BadGuy*>(&other);