Changed the way the scrolling was calculated. Instead of calculating it relatively...

[supertux.git] / src / gameobjs.h

diff --git a/src/gameobjs.h b/src/gameobjs.h
index 12fafaf..92d311d 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,14 +31,14 @@
 #define NO_BOUNCE 0
 #define BOUNCE 1
 
-class BouncyDistro
+class BouncyDistro : public GameObject
 {
  public:
-  base_type base;
   
   void init(float x, float y);
   void action(double frame_ratio);
   void draw(); 
+  std::string type() { return "BouncyDistro"; };
 };
 
 extern Surface* img_distro[4];
@@ -46,41 +48,41 @@ extern Surface* img_distro[4];
 
 class Tile;
 
-class BrokenBrick
+class BrokenBrick : public GameObject
 {
  public:
-  base_type base;
   Timer timer;
   Tile* tile;
 
   void init(Tile* tile, float x, float y, float xm, float ym);
   void action(double frame_ratio);
   void draw();
+  std::string type() { return "BrokenBrick"; };
 };
 
-class BouncyBrick
+class BouncyBrick : public GameObject
 {
  public:
   float offset;
   float offset_m;
   int shape;
-  base_type base;
 
   void init(float x, float y);
   void action(double frame_ratio);
   void draw();
+  std::string type() { return "BouncyBrick"; };
 };
 
-class FloatingScore
+class FloatingScore : public GameObject
 {
  public:
   int value;
   Timer timer;
-  base_type base;
   
   void init(float x, float y, int s);
   void action(double frame_ratio);
   void draw();
+  std::string type() { return "FloatingScore"; };
 };
 
 #endif