Finally!!

[supertux.git] / src / tile.h

diff --git a/src/tile.h b/src/tile.h
index ab78d59..40feb80 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"
@@ -23,7 +24,12 @@ Tile Class
 */
 struct Tile
 {
-  std::vector<texture_type> images;
+  int id;
+
+  std::vector<Surface*> images;
+  std::vector<Surface*> editor_images;
+  
+  std::vector<std::string>  filenames;
 
   /** solid tile that is indestructable by Tux */
   bool solid;
@@ -34,6 +40,9 @@ struct Tile
   /** FIXME: ? */
   bool ice;
 
+  /** water */
+  bool water;
+
   /** Bonusbox, content is stored in \a data */
   bool fullbox;
 
@@ -43,8 +52,20 @@ struct Tile
   /** General purpose data attached to a tile (content of a box, type of coin) */
   int data;
 
+  /** Id of the tile that is going to replace this tile once it has
+      been collected or jumped at */
+  int next_tile;
+
   int anim_speed;
-  unsigned char alpha;
+  
+  /** Draw a tile on the screen: */
+  static void draw(float x, float y, unsigned int c, Uint8 alpha = 255);
+};
+
+struct TileGroup
+{
+  std::string name;
+  std::vector<int> tiles;
 };
 
 class TileManager
@@ -53,11 +74,25 @@ 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(); }
-  Tile* get(unsigned int id) { if( id < tiles.size()) { return tiles[id]; } else { return NULL; } }
+  static std::vector<TileGroup>* tilegroups() { return tilegroups_ ? tilegroups_ : tilegroups_ = new std::vector<TileGroup>; }
+  Tile* get(unsigned int id) {
+    if(id < tiles.size())
+      {
+        return tiles[id]; 
+      }
+    else
+      {
+        // Never return 0, but return the 0th tile instead so that
+        // user code doesn't have to check for NULL pointers all over
+        // the place
+        return tiles[0]; 
+      } 
+  }
 };
 
 #endif