Updated code to support new stuff from 0.1.2.

[supertux.git] / src / sector.h

diff --git a/src/sector.h b/src/sector.h
index fe2acf1..1b186ef 100644 (file)
--- a/src/sector.h
+++ b/src/sector.h
@@ -23,13 +23,19 @@
 #include <string>
 #include <vector>
 
-#include "vector.h"
+#include "math/vector.h"
 #include "badguy.h"
 #include "special.h"
-#include "musicref.h"
-#include "screen/drawing_context.h"
+#include "audio/musicref.h"
+#include "video/drawing_context.h"
 
+using namespace SuperTux;
+
+namespace SuperTux {
 class GameObject;
+class LispReader;
+}
+
 class InteractiveObject;
 class Background;
 class Player;
@@ -39,9 +45,8 @@ class FlyingPlatform;
 class TileMap;
 class Upgrade;
 class Bullet;
+class SmokeCloud;
 class BadGuy;
-class Vector;
-class LispReader;
 class Tile;
 
 struct SpawnPoint
@@ -98,6 +103,7 @@ public:
                                                                                 
   void add_upgrade(const Vector& pos, Direction dir, UpgradeKind kind);
   bool add_bullet(const Vector& pos, float xm, Direction dir);
+  bool add_smoke_cloud(const Vector& pos);
                                                                                 
   /** Try to grab the coin at the given coordinates */
   void trygrabdistro(const Vector& pos, int bounciness);
@@ -150,6 +156,7 @@ private:
 
   std::vector<Upgrade*> upgrades;
   std::vector<Bullet*> bullets;
+  std::vector<SmokeCloud*> smoke_clouds;
 
 public: // ugly
   typedef std::vector<InteractiveObject*> InteractiveObjects;