- fixed problem with last_menu not being able to handle menues deeper than two submenues

[supertux.git] / src / gameobjs.h

diff --git a/src/gameobjs.h b/src/gameobjs.h
index 1b759a6..12fafaf 100644 (file)
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -35,11 +35,11 @@ class BouncyDistro
   base_type base;
   
   void init(float x, float y);
-  void action();
+  void action(double frame_ratio);
   void draw(); 
 };
 
-extern texture_type img_distro[4];
+extern Surface* img_distro[4];
 
 #define BOUNCY_BRICK_MAX_OFFSET 8
 #define BOUNCY_BRICK_SPEED 0.9
@@ -50,11 +50,11 @@ class BrokenBrick
 {
  public:
   base_type base;
-  timer_type timer;
+  Timer timer;
   Tile* tile;
 
   void init(Tile* tile, float x, float y, float xm, float ym);
-  void action();
+  void action(double frame_ratio);
   void draw();
 };
 
@@ -67,7 +67,7 @@ class BouncyBrick
   base_type base;
 
   void init(float x, float y);
-  void action();
+  void action(double frame_ratio);
   void draw();
 };
 
@@ -75,11 +75,11 @@ class FloatingScore
 {
  public:
   int value;
-  timer_type timer;
+  Timer timer;
   base_type base;
   
   void init(float x, float y, int s);
-  void action();
+  void action(double frame_ratio);
   void draw();
 };
 
@@ -87,4 +87,4 @@ class FloatingScore
 
 /* Local Variables: */
 /* mode:c++ */
-/* End */
+/* End: */