- fixed level editor crash (a hack)

[supertux.git] / src / gameobjs.h

diff --git a/src/gameobjs.h b/src/gameobjs.h
index bc0d0e7..49515a3 100644 (file)
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -42,9 +42,7 @@ class BouncyDistro : public GameObject, public Drawable
 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"; };
+  virtual void draw(Camera& viewport, int layer);
 
 private:
   Vector position;
@@ -65,10 +63,7 @@ public:
       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"; };
+  virtual void draw(Camera& viewport, int layer);
 
 private:
   Timer timer;
@@ -82,11 +77,8 @@ class BouncyBrick : public GameObject, public Drawable
 public:
   BouncyBrick(DisplayManager& displaymanager, const Vector& pos);
   virtual void action(float elapsed_time);
-  virtual void draw(ViewPort& viewport, int layer);
+  virtual void draw(Camera& viewport, int layer);
   
-  virtual std::string type() const
-  { return "BouncyBrick"; };
-
 private:
   Vector position;
   float offset;   
@@ -100,9 +92,7 @@ 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"; };
+  virtual void draw(Camera& viewport, int layer);
 
 private:
   Vector position;
@@ -117,9 +107,7 @@ public:
  
   virtual void write(LispWriter& writer);
   virtual void action(float frame_ratio);
-  virtual void draw(ViewPort& viewport, int layer);
-  virtual std::string type() const
-  { return "Trampoline"; };
+  virtual void draw(Camera& viewport, int layer);
 
   virtual void collision(const MovingObject& other, int);
   void collision(void *p_c_object, int c_object, CollisionType type);
@@ -139,13 +127,14 @@ public:
  
   virtual void write(LispWriter& writer);
   virtual void action(float frame_ratio);
-  virtual void draw(ViewPort& viewport, int layer);
-  virtual std::string type() const
-  { return "Trampoline"; };
+  virtual void draw(Camera& viewport, int layer);
 
   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;
 
@@ -154,6 +143,8 @@ public:
   std::vector<int> pos_y;
   float velocity;
 
+  float vel_x, vel_y;  // calculated based in the velocity
+
   int point;
   bool move;
   unsigned int frame;