Haywire: Fix a null-pointer dereference when Haywire gets hit by an iceblock.

SVN-Revision: 6520

diff --git a/src/badguy/haywire.cpp b/src/badguy/haywire.cpp
index a99cb3b..2252515 100644 (file)
--- a/src/badguy/haywire.cpp
+++ b/src/badguy/haywire.cpp
@@ -90,7 +90,8 @@ Haywire::collision_squished(GameObject& object)
   }
 
   if (is_stunned) {
-    player->bounce (*this);
+    if (player)
+      player->bounce (*this);
     return true;
   }
 
@@ -106,7 +107,9 @@ Haywire::collision_squished(GameObject& object)
   time_stunned = TIME_STUNNED;
   is_stunned = true;
 
-  player->bounce (*this);
+  if (player)
+    player->bounce (*this);
+
   return true;
 }