added a powerup object that can be placed in levels and represent various powerups...

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

diff --git a/src/object/player.h b/src/object/player.h
index 8a4c6c5..e310cad 100644 (file)
--- a/src/object/player.h
+++ b/src/object/player.h
@@ -39,7 +39,8 @@ static const float TUX_SAFE_TIME = 1.250;
 static const float TUX_INVINCIBLE_TIME = 10.0;
 static const float TUX_INVINCIBLE_TIME_WARNING = 2.0;
 static const float TUX_FLAPPING_TIME = 1; /* How long Tux can flap his wings to gain additional jump height */
-static const float TIME_WARNING = 20;     /* When to alert player they're low on time! */
+static const float TUX_FLAPPING_STRENGTH = 100; /* How much Y velocity Tux gains when flapping */
+static const float TUX_FLAPPING_LEAST_X = 30; /* How much X velocity Tux gains when flapping from vertical jump */
 static const float GROWING_TIME = 1.0;
 static const int GROWING_FRAMES = 7;
 
@@ -113,6 +114,7 @@ public:
   int flaps_nb;
 
   // temporary to help player's choosing a flapping
+  // TODO: remove this after agreeing on flapstyle!
   enum { MAREK_FLAP, RICARDO_FLAP, RYAN_FLAP, NO_FLAP };
   int flapping_mode;
 
@@ -133,7 +135,7 @@ public:
 
   void set_controller(Controller* controller);  
 
-  virtual void action(float elapsed_time);
+  virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);