From: Tobias Markus <tobbi@mozilla-uk.org>
Date: Sun, 13 Oct 2013 12:14:29 +0000 (+0200)
Subject: Haywire not moving when jumping on it after freezing
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=8afc40ed5f1f3ab79bd0a4a875c5197e367668a3;p=supertux.git

Haywire not moving when jumping on it after freezing
---

diff --git a/src/badguy/haywire.cpp b/src/badguy/haywire.cpp
index b886b147b..97d1eade5 100644
--- a/src/badguy/haywire.cpp
+++ b/src/badguy/haywire.cpp
@@ -81,6 +81,10 @@ Haywire::collision_squished(GameObject& object)
       player->bounce (*this);
     return true;
   }
+  
+  if(WalkingBadguy::is_frozen()) {
+    WalkingBadguy::unfreeze();
+  }
 
   if (!is_exploding) {
     set_action ((dir == LEFT) ? "ticking-left" : "ticking-right", /* loops = */ -1);