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

diff --git a/src/gameobjs.h b/src/gameobjs.h
index 72b9ee789..197273f0a 100644
--- 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,76 +16,194 @@
 // 
 //  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
 
-#include "type.h"
-#include "texture.h"
-#include "timer.h"
+#include "special/base.h"
+#include "video/surface.h"
+#include "special/timer.h"
 #include "scene.h"
+#include "math/physic.h"
+#include "collision.h"
+#include "special/game_object.h"
+#include "special/moving_object.h"
+#include "serializable.h"
+#include "utils/lispwriter.h"
 
 /* Bounciness of distros: */
 #define NO_BOUNCE 0
 #define BOUNCE 1
 
-class BouncyDistro
+namespace SuperTux {
+class Sprite;
+}
+
+struct TileId;
+
+class BouncyDistro : public GameObject
 {
- public:
-  base_type base;
-  
-  void init(float x, float y);
-  void action(double frame_ratio);
-  void draw(); 
+public:
+  BouncyDistro(const Vector& pos);
+  virtual void action(float elapsed_time);
+  virtual void draw(DrawingContext& context);
+
+private:
+  Vector position;
+  float ym;
 };
 
-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 BrokenBrick
+class BrokenBrick : public GameObject
 {
- public:
-  base_type base;
-  timer_type timer;
-  Tile* tile;
+public:
+  BrokenBrick(Tile* tile, const Vector& pos, const Vector& movement);
 
-  void init(Tile* tile, float x, float y, float xm, float ym);
-  void action(double frame_ratio);
-  void draw();
+  virtual void action(float elapsed_time);
+  virtual void draw(DrawingContext& context);
+
+private:
+  Timer timer;
+  Tile* tile;
+  Vector position;
+  Vector movement;
 };
 
-class BouncyBrick
+class BouncyBrick : public GameObject
 {
- public:
-  float offset;
+public:
+  BouncyBrick(const Vector& pos);
+  virtual void action(float elapsed_time);
+  virtual void draw(DrawingContext& context);
+  
+private:
+  Vector position;
+  float offset;   
   float offset_m;
-  int shape;
-  base_type base;
+  TileId& shape;      
+};
+
+class FloatingText : public GameObject
+{
+public:
+  FloatingText(const Vector& pos, const std::string& text_);
+  FloatingText(const Vector& pos, int s);  // use this for score, for instance
+  
+  virtual void action(float elapsed_time);
+  virtual void draw(DrawingContext& context);
+
+private:
+  Vector position;
+  std::string text;
+  Timer timer;  
+};
+
+extern Sprite *img_trampoline;
+
+class Trampoline : public MovingObject, public Serializable
+{
+public:
+  Trampoline(LispReader& reader);
+  Trampoline(float x, float y);
+ 
+  virtual void write(LispWriter& writer);
+  virtual void action(float frame_ratio);
+  virtual void draw(DrawingContext& context);
+
+  virtual void collision(const MovingObject& other, int);
+  void collision(void *p_c_object, int c_object, CollisionType type);
+
+  Physic physic;
+  enum { M_NORMAL, M_HELD } mode;
 
-  void init(float x, float y);
-  void action(double frame_ratio);
-  void draw();
+ private:
+  float power;
+  unsigned int frame;
 };
 
-class FloatingScore
+extern Sprite *img_flying_platform;
+
+class FlyingPlatform : public MovingObject, public Serializable
 {
- public:
-  int value;
-  timer_type timer;
-  base_type base;
+public:
+  FlyingPlatform(LispReader& reader);
+  FlyingPlatform(int x, int y);
+ 
+  virtual void write(LispWriter& writer);
+  virtual void action(float frame_ratio);
+  virtual void draw(DrawingContext& context);
+
+  virtual void collision(const MovingObject& other, int);
+  void collision(void *p_c_object, int c_object, CollisionType type);
+
+  float get_vel_x() { return vel_x; }
+  float get_vel_y() { return vel_y; }
+
+  Physic physic;
+  enum { M_NORMAL, M_HELD } mode;
+
+ private:
+  std::vector<int> pos_x;
+  std::vector<int> pos_y;
+  float velocity;
+
+  float vel_x, vel_y;  // calculated based in the velocity
+
+  int point;
+  bool move;
+  unsigned int frame;
+};
+
+extern Sprite *img_smoke_cloud;
+
+class SmokeCloud : public GameObject
+{
+public:
+  SmokeCloud(const Vector& pos);
   
-  void init(float x, float y, int s);
-  void action(double frame_ratio);
-  void draw();
+  virtual void action(float elapsed_time);
+  virtual void draw(DrawingContext& context);
+
+private:
+  Timer timer;
+  Vector position;
 };
 
+class Particles : public GameObject
+{
+public:
+  Particles(const Vector& epicenter, const Vector& velocity, const Vector& acceleration, int number, Color color, int size, int life_time);
+  ~Particles();
+  
+  virtual void action(float elapsed_time);
+  virtual void draw(DrawingContext& context);
+
+private:
+  Color color;
+  float size;
+  Vector vel, accel;
+  Timer timer;
+  bool live_forever;
+
+  struct Particle {
+    Vector pos;
+    float angle;
+    };
+  std::vector <Particle*> particles;
+};
+
+void load_object_gfx();
+
 #endif 
 
 /* Local Variables: */
 /* mode:c++ */
-/* End */
+/* End: */