From e6ff6a3532bc3836ddebe2d539d41688d01c41a3 Mon Sep 17 00:00:00 2001
From: Tobias Markus <tobbi@mozilla-uk.org>
Date: Mon, 4 Nov 2013 21:15:27 +0100
Subject: [PATCH] Do not resurrect squished bouncing snowball when colliding
 with badguy or tile

---
 src/badguy/bouncing_snowball.cpp | 5 +++++
 1 file changed, 5 insertions(+)

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);
-- 
2.11.0