converted player to new object system

[supertux.git] / src / gameobjs.h

diff --git a/src/gameobjs.h b/src/gameobjs.h
index 2e24a34..e303bbc 100644 (file)
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -1,3 +1,23 @@
+//  $Id$
+// 
+//  SuperTux
+//  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
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  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.
 
 #ifndef SUPERTUX_GAMEOBJS_H
 #define SUPERTUX_GAMEOBJS_H
@@ -6,69 +26,143 @@
 #include "texture.h"
 #include "timer.h"
 #include "scene.h"
+#include "physic.h"
+#include "collision.h"
+#include "game_object.h"
+#include "drawable.h"
+
+enum ObjectType { OBJ_NONE, OBJ_BADGUY, OBJ_TRAMPOLINE };
+
+template <class T>
+struct ObjectData
+{
+  int x;
+  int y;
+  ObjectType type;
+  T type_specific;
+
+  ObjectData(ObjectData* pobject)
+    : x((int)pobject->x), y((int)pobject->y), type(pobject->type), type_specific(pobject->type_specific) {};
+  ObjectData(int x_, int y_, ObjectType type_, T type_specific_) 
+    : x(x_), y(y_), type(type_), type_specific(type_specific_) {};
+
+  ObjectData()
+    : x(0), y(0), type(OBJ_NONE), type_specific() {};
+};
 
 /* Bounciness of distros: */
 #define NO_BOUNCE 0
 #define BOUNCE 1
 
-class bouncy_distro_type
+class BouncyDistro : public _GameObject, public Drawable
 {
- public:
-  base_type base;
+public:
+  BouncyDistro(DisplayManager& displaymanager, const Vector& pos);
+  virtual void action(float elapsed_time);
+  virtual void draw(ViewPort& viewport, int layer);
+  virtual std::string type() const
+  { return "BouncyDistro"; };
+
+private:
+  Vector position;
+  float ym;
 };
 
-extern texture_type img_distro[4];
-
-void bouncy_distro_init(bouncy_distro_type* pbouncy_distro, float x, float y);
-void bouncy_distro_action(bouncy_distro_type* pbouncy_distro);
-void bouncy_distro_draw(bouncy_distro_type* pbouncy_distro);
-void bouncy_distro_collision(bouncy_distro_type* pbouncy_distro, int c_object);
+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 _GameObject, public Drawable
 {
- public:
-  base_type base;
-  timer_type timer;
+public:
+  BrokenBrick(DisplayManager& displaymanager, Tile* tile,
+      const Vector& pos, const Vector& movement);
+
+  virtual void action(float elapsed_time);
+  virtual void draw(ViewPort& viewport, int layer);
+
+  virtual std::string type() const
+  { return "BrokenBrick"; };
+
+private:
+  Timer timer;
   Tile* tile;
+  Vector position;
+  Vector movement;
 };
 
-void broken_brick_init(broken_brick_type* pbroken_brick, Tile* tile,
-                       float x, float y, float xm, float ym);
-void broken_brick_action(broken_brick_type* pbroken_brick);
-void broken_brick_draw(broken_brick_type* pbroken_brick);
-
-class bouncy_brick_type
+class BouncyBrick : public _GameObject, public Drawable
 {
- public:
-  float offset;
+public:
+  BouncyBrick(DisplayManager& displaymanager, const Vector& pos);
+  virtual void action(float elapsed_time);
+  virtual void draw(ViewPort& viewport, int layer);
+  
+  virtual std::string type() const
+  { return "BouncyBrick"; };
+
+private:
+  Vector position;
+  float offset;   
   float offset_m;
-  int shape;
-  base_type base;
+  int shape;      
 };
 
-void bouncy_brick_init(bouncy_brick_type* pbouncy_brick, float x, float y);
-void bouncy_brick_action(bouncy_brick_type* pbouncy_brick);
-void bouncy_brick_draw(bouncy_brick_type* pbouncy_brick);
+class FloatingScore : public _GameObject, public Drawable
+{
+public:
+  FloatingScore(DisplayManager& displaymanager, const Vector& pos, int s);
+  
+  virtual void action(float elapsed_time);
+  virtual void draw(ViewPort& viewport, int layer);
+  virtual std::string type() const
+  { return "FloatingScore"; };
+
+private:
+  Vector position;
+  char str[10];
+  Timer timer;  
+};
+
+
+/* Trampoline */
+struct TrampolineData
+{
+  float power;
+};
 
-class floating_score_type
+class Trampoline : public GameObject
 {
  public:
-  int value;
-  timer_type timer;
-  base_type base;
+  void init(float x, float y);
+  void action(double frame_ratio);
+  void draw();
+  std::string type() { return "Trampoline"; };
+
+  Trampoline(ObjectData<TrampolineData> data)
+  {
+    power = data.type_specific.power;
+
+    init(data.x, data.y);
+  };
+
+  void collision(void *p_c_object, int c_object, CollisionType type);
+
+  Physic physic;
+  enum { M_NORMAL, M_HELD } mode;
+
+ private:
+  float power;
+  unsigned int frame;
 };
 
-void floating_score_init(floating_score_type* pfloating_score, float x, float y, int s);
-void floating_score_action(floating_score_type* pfloating_score);
-void floating_score_draw(floating_score_type* pfloating_score);
+void load_object_gfx();
 
 #endif 
 
 /* Local Variables: */
 /* mode:c++ */
-/* End */
+/* End: */