stopped infoblocks from ringing, since they're not telephones anymore - code is only...

[supertux.git] / src / object / gameobjs.hpp

diff --git a/src/object/gameobjs.hpp b/src/object/gameobjs.hpp
index 4aa1fa9..18718e1 100644 (file)
--- a/src/object/gameobjs.hpp
+++ b/src/object/gameobjs.hpp
@@ -27,6 +27,7 @@
 #include "game_object.hpp"
 #include "moving_object.hpp"
 #include "serializable.hpp"
+#include "video/color.hpp"
 
 /* Bounciness of distros: */
 #define NO_BOUNCE 0
@@ -79,51 +80,21 @@ private:
   Timer timer;  
 };
 
-extern Sprite *img_smoke_cloud;
-
 class SmokeCloud : public GameObject
 {
 public:
   SmokeCloud(const Vector& pos);
+  ~SmokeCloud();
   
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
 
 private:
+  Sprite* sprite;
   Timer timer;
   Vector position;
 };
 
-class Particles : public GameObject
-{
-public:
-  Particles(const Vector& epicenter, int min_angle, int max_angle,
-            const Vector& initial_velocity, const Vector& acceleration,
-            int number, Color color, int size, float life_time, int drawing_layer);
-  ~Particles();
-  
-  virtual void update(float elapsed_time);
-  virtual void draw(DrawingContext& context);
-
-private:
-  Vector accel;
-  Timer timer;
-  bool live_forever;
-
-  Color color;
-  float size;
-  int drawing_layer;
-
-  struct Particle {
-    Vector pos, vel;
-//     float angle;
-    };
-  std::vector <Particle*> particles;
-};
-
-void load_object_gfx();
-void free_object_gfx();
-
 #endif 
 
 /* Local Variables: */