X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameobjs.h;h=12fafaf816f963da59405d8fa1221118c8ab8442;hb=9e082fc66762cb43a25955a971082a0a5aab0840;hp=c279e4c7e9e4abb585b4db10cfc2267da89581b9;hpb=37a568a4a57516a0fea5a5972acd2310e49ff769;p=supertux.git

diff --git a/src/gameobjs.h b/src/gameobjs.h
index c279e4c7e..12fafaf81 100644
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -29,36 +29,36 @@
 #define NO_BOUNCE 0
 #define BOUNCE 1
 
-class bouncy_distro_type
+class BouncyDistro
 {
  public:
   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
 
 class Tile;
 
-class broken_brick_type
+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();
 };
 
-class bouncy_brick_type
+class BouncyBrick
 {
  public:
   float offset;
@@ -67,19 +67,19 @@ class bouncy_brick_type
   base_type base;
 
   void init(float x, float y);
-  void action();
+  void action(double frame_ratio);
   void draw();
 };
 
-class floating_score_type
+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 floating_score_type
 
 /* Local Variables: */
 /* mode:c++ */
-/* End */
+/* End: */