- memleak fix and menu fix from MatzeB

[supertux.git] / src / gameobjs.h

diff --git a/src/gameobjs.h b/src/gameobjs.h
index c279e4c..162a3be 100644 (file)
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -1,7 +1,8 @@
 //  $Id$
 // 
 //  SuperTux
-//  Copyright (C) 2004 SuperTux Development Team, see AUTHORS for details
+//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -15,7 +16,8 @@
 // 
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
 
 #ifndef SUPERTUX_GAMEOBJS_H
 #define SUPERTUX_GAMEOBJS_H
@@ -29,36 +31,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 +69,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 +89,4 @@ class floating_score_type
 
 /* Local Variables: */
 /* mode:c++ */
-/* End */
+/* End: */