From: Tobias Markus Date: Mon, 4 Nov 2013 20:15:27 +0000 (+0100) Subject: Do not resurrect squished bouncing snowball when colliding with badguy or tile X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0865a435b92a42714f404611ae778c1e77da4a50;p=supertux.git Do not resurrect squished bouncing snowball when colliding with badguy or tile --- diff --git a/src/badguy/bouncing_snowball.cpp b/src/badguy/bouncing_snowball.cpp index 64f49f7ca..67af264e3 100644 --- a/src/badguy/bouncing_snowball.cpp +++ b/src/badguy/bouncing_snowball.cpp @@ -50,6 +50,11 @@ BouncingSnowball::collision_squished(GameObject& object) void BouncingSnowball::collision_solid(const CollisionHit& hit) { + if(sprite->get_action() == "squished") + { + return; + } + if(hit.bottom) { if(get_state() == STATE_ACTIVE) { physic.set_velocity_y(JUMPSPEED);