nolok dies properly now :)

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index cf9fe19..ada9e96 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -21,7 +21,6 @@
 
 #include "SDL.h"
 
-#include "bitmask.h"
 #include "timer.h"
 #include "video/surface.h"
 #include "collision.h"
@@ -112,7 +111,7 @@ public:
     delete feet;
   }
 
-  void set_action(std::string action);
+  void set_action(std::string action, int loops = -1);
   void one_time_animation();
   void draw(DrawingContext& context, const Vector& pos, int layer,
                 Uint32 drawing_effect = NONE_EFFECT);
@@ -157,8 +156,6 @@ public:
   bool falling_from_flap;
   bool enable_hover;
   bool butt_jump;
-  int frame_;
-  int frame_main;
   
   float flapping_velocity;
 
@@ -172,7 +169,6 @@ public:
   Timer2 invincible_timer;
   Timer2 skidding_timer;
   Timer2 safe_timer;
-  Timer2 frame_timer;
   Timer2 kick_timer;
   Timer2 shooting_timer;   // used to show the arm when Tux is shooting
   Timer2 dying_timer;