- Physic C++ rewrite (Matze Braun)

[supertux.git] / src / tile.h

diff --git a/src/tile.h b/src/tile.h
index 1d301e8..2175b2b 100644 (file)
--- a/src/tile.h
+++ b/src/tile.h
@@ -12,6 +12,7 @@
 #ifndef TILE_H
 #define TILE_H
 
+#include <map>
 #include <vector>
 #include "texture.h"
 #include "globals.h"
@@ -26,6 +27,8 @@ struct Tile
   int id;
 
   std::vector<texture_type> images;
+  std::vector<texture_type> editor_images;
+  
   std::vector<std::string>  filenames;
 
   /** solid tile that is indestructable by Tux */
@@ -37,6 +40,9 @@ struct Tile
   /** FIXME: ? */
   bool ice;
 
+  /** water */
+  bool water;
+
   /** Bonusbox, content is stored in \a data */
   bool fullbox;
 
@@ -49,10 +55,14 @@ struct Tile
   /** Id of the tile that is going to replace this tile once it has
       been collected or jumped at */
   int next_tile;
-  int next_tile2;
 
   int anim_speed;
-  unsigned char alpha;
+};
+
+struct TileGroup
+{
+  std::string name;
+  std::vector<int> tiles;
 };
 
 class TileManager
@@ -61,10 +71,12 @@ class TileManager
   TileManager();
   std::vector<Tile*> tiles;
   static TileManager* instance_ ;
+  static std::vector<TileGroup>* tilegroups_;
   void load_tileset(std::string filename);
   
  public:
   static TileManager* instance() { return instance_ ? instance_ : instance_ = new TileManager(); }
+  static std::vector<TileGroup>* tilegroups() { return tilegroups_ ? tilegroups_ : tilegroups_ = new std::vector<TileGroup>; }
   Tile* get(unsigned int id) {
     if(id < tiles.size())
       {
@@ -80,4 +92,6 @@ class TileManager
   }
 };
 
+
+
 #endif