No more segfaults when trying to spawn bullets of unknown type

[supertux.git] / src / object / player.hpp

diff --git a/src/object/player.hpp b/src/object/player.hpp
index 7005674..d76d21a 100644 (file)
--- a/src/object/player.hpp
+++ b/src/object/player.hpp
@@ -96,7 +96,6 @@ public:
   Timer shooting_timer;   // used to show the arm when Tux is shooting
   Timer dying_timer;
   bool growing;
-  Timer idle_timer;
   Timer backflip_timer;
 
 public:
@@ -196,7 +195,7 @@ public:
   void do_jump(float yspeed);
 
   /**
-   * Adds velocity to the player (be carefull when using this)
+   * Adds velocity to the player (be careful when using this)
    */
   void add_velocity(const Vector& velocity);
 
@@ -225,6 +224,10 @@ public:
   {
       return grabbed_object;
   }
+  void stop_grabbing()
+  {
+    grabbed_object = NULL;
+  }
 
   /**
    * Switches ghost mode on/off.
@@ -306,6 +309,9 @@ private:
 
   Timer unduck_hurt_timer; /**< if Tux wants to stand up again after ducking and cannot, this timer is started */
 
+  Timer idle_timer;
+  unsigned int idle_stage;
+
   Climbable* climbing; /**< Climbable object we are currently climbing, null if none */
 };