From: Tobias Markus Date: Tue, 5 Nov 2013 17:34:10 +0000 (+0100) Subject: Don't resurrect zeekling when colliding after squished X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=c407dd13cf3f7001da41b34e9320f10d8f7c3126;p=supertux.git Don't resurrect zeekling when colliding after squished --- diff --git a/src/badguy/zeekling.cpp b/src/badguy/zeekling.cpp index 1c49add59..8fff3eac3 100644 --- a/src/badguy/zeekling.cpp +++ b/src/badguy/zeekling.cpp @@ -109,6 +109,12 @@ Zeekling::onBumpVertical() { void Zeekling::collision_solid(const CollisionHit& hit) { + if(sprite->get_action() == "squished-left" || + sprite->get_action() == "squished-right") + { + return; + } + if(hit.top || hit.bottom) { onBumpVertical(); } else if(hit.left || hit.right) {