X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.h;h=598842bb5530e2ae577586f85be6fff304e4cca6;hb=6e843b1780f62f45b7021bd8c38181aa211588ee;hp=05595abd0b6d601b402a575062874bac8004245f;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/sector.h b/src/sector.h
index 05595abd0..598842bb5 100644
--- a/src/sector.h
+++ b/src/sector.h
@@ -24,16 +24,18 @@
 #include <vector>
 
 #include "math/vector.h"
-#include "badguy.h"
 #include "audio/musicref.h"
 #include "video/drawing_context.h"
+#include "defines.h"
 
 using namespace SuperTux;
 
 namespace SuperTux {
 class GameObject;
 class LispReader;
+class LispWriter;
 class Sprite;
+class Rectangle;
 }
 
 class InteractiveObject;
@@ -104,9 +106,6 @@ public:
  
   bool add_bullet(const Vector& pos, float xm, Direction dir);
   bool add_smoke_cloud(const Vector& pos);
-  bool add_particles(const Vector& epicenter, int min_angle, int max_angle,
-      const Vector& initial_velocity, const Vector& acceleration, int number,
-      Color color, int size, int life_time, int drawing_layer);
   void add_floating_text(const Vector& pos, const std::string& text);
                                                                                 
   /** Flip the all the sector vertically. The purpose of this is to let
@@ -125,7 +124,7 @@ private:
   void collision_object(MovingObject* object1, MovingObject* object2);
   
   void load_music();
-  GameObject* parseObject(const std::string& name, LispReader& reader);
+  GameObject* parse_object(const std::string& name, LispReader& reader);
   
   static Sector* _current;
   
@@ -154,6 +153,8 @@ public: // TODO make this private again
   GameObjects gameobjects;
 
 private:
+  void fix_old_tiles();
+  
   /// container for newly created objects, they'll be added in Sector::action
   GameObjects gameobjects_new;