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

diff --git a/src/gameobjs.h b/src/gameobjs.h
index 72b9ee789..12fafaf81 100644
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -39,7 +39,7 @@ class BouncyDistro
   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,7 +50,7 @@ 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);
@@ -75,7 +75,7 @@ class FloatingScore
 {
  public:
   int value;
-  timer_type timer;
+  Timer timer;
   base_type base;
   
   void init(float x, float y, int s);
@@ -87,4 +87,4 @@ class FloatingScore
 
 /* Local Variables: */
 /* mode:c++ */
-/* End */
+/* End: */