fixed butt jump to work even when up-key is not pressed, added a little jump after...

[supertux.git] / src / gameobjs.h

diff --git a/src/gameobjs.h b/src/gameobjs.h
index 2276faa..b6470e4 100644 (file)
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -27,6 +27,7 @@
 #include "timer.h"
 #include "scene.h"
 #include "physic.h"
+#include "collision.h"
 
 enum ObjectType { OBJ_NONE, OBJ_BADGUY, OBJ_TRAMPOLINE };
 
@@ -109,7 +110,7 @@ class FloatingScore : public GameObject
 /* Trampoline */
 struct TrampolineData
 {
-  int power;
+  float power;
 };
 
 class Trampoline : public GameObject
@@ -127,10 +128,14 @@ class Trampoline : public GameObject
     init(data.x, data.y);
   };
 
+  void collision(void *p_c_object, int c_object, CollisionType type);
+
   Physic physic;
+  enum { M_NORMAL, M_HELD } mode;
 
  private:
-  int power;
+  float power;
+  unsigned int frame;
 };