- did some C++ifying. let's try to follow suit :)

[supertux.git] / src / tile.h

diff --git a/src/tile.h b/src/tile.h
index 3dea6c6..978ed3a 100644 (file)
--- a/src/tile.h
+++ b/src/tile.h
@@ -21,44 +21,64 @@
 #ifndef TILE_H
 #define TILE_H
 
+#include <set>
 #include <map>
 #include <vector>
-#include "texture.h"
+
+#include "screen/texture.h"
 #include "globals.h"
 #include "lispreader.h"
 #include "setup.h"
+#include "vector.h"
+
+class LispReader;
 
 /**
 Tile Class
 */
-struct Tile
+class Tile
 {
+public:
+  Tile();
+  ~Tile();
+
+  /// parses the tile and returns it's id number
+  int read(LispReader& reader);
+
   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;
-
-  /** a brick that can be destroyed by jumping under it */
-  bool brick;
-
-  /** FIXME: ? */
-  bool ice;
-
-  /** water */
-  bool water;
-
-  /** Bonusbox, content is stored in \a data */
-  bool fullbox;
-
-  /** Tile is a distro/coin */
-  bool distro;
-
-  /** General purpose data attached to a tile (content of a box, type of coin) */
+  /// bitset for tileflags
+  enum {
+      /** solid tile that is indestructable by Tux */
+      SOLID     = 0x0001,
+      /** uni-directional solid tile */
+      UNISOLID  = 0x0002,
+      /** a brick that can be destroyed by jumping under it */
+      BRICK     = 0x0004,
+      /** an ice brick that makes tux sliding more than usual */
+      ICE       = 0x0008,
+      /** a water tile in which tux starts to swim */
+      WATER     = 0x0010,
+      /** a tile that hurts the player if he touches it */
+      SPIKE     = 0x0020,
+      /** Bonusbox, content is stored in \a data */
+      FULLBOX   = 0x0040,
+      /** Tile is a coin */
+      COIN      = 0x0080,
+      /** the level should be finished when touching a goaltile.
+       * if data is 0 then the endsequence should be triggered, if data is 1
+       * then we can finish the level instantly.
+       */
+      GOAL      = 0x0100
+  };
+
+  /** tile attributes */
+  Uint32 attributes;
+  
+  /** 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
@@ -68,11 +88,32 @@ struct Tile
   int anim_speed;
   
   /** Draw a tile on the screen: */
-  static void draw(float x, float y, unsigned int c, Uint8 alpha = 255);
+  static void draw(const Vector& pos, unsigned int c, Uint8 alpha = 255);
+
+  /// returns the width of the tile in pixels
+  int getWidth() const
+  { 
+    if(!images.size())
+      return 0;
+    return images[0]->w;
+  }
+
+  /// returns the height of the tiles in pixels
+  int getHeight() const
+  {
+    if(!images.size())
+      return 0;
+    return images[0]->h;
+  }
 };
 
 struct TileGroup
 {
+  friend bool operator<(const TileGroup& lhs, const TileGroup& rhs)
+  { return lhs.name < rhs.name; };
+  friend bool operator>(const TileGroup& lhs, const TileGroup& rhs)
+  { return lhs.name > rhs.name; };
+
   std::string name;
   std::vector<int> tiles;
 };
@@ -81,14 +122,25 @@ class TileManager
 {
  private:
   TileManager();
+  ~TileManager();
+  
   std::vector<Tile*> tiles;
   static TileManager* instance_ ;
-  static std::vector<TileGroup>* tilegroups_;
+  static std::set<TileGroup>* tilegroups_;
   void load_tileset(std::string filename);
+
+  std::string current_tileset;
   
  public:
-  static TileManager* instance() { return instance_ ? instance_ : instance_ = new TileManager(); }
-  static std::vector<TileGroup>* tilegroups() { return tilegroups_ ? tilegroups_ : tilegroups_ = new std::vector<TileGroup>; }
+  static TileManager* instance()
+  { return instance_ ? instance_ : instance_ = new TileManager(); }
+  static void destroy_instance()
+  { delete instance_; instance_ = 0; }
+
+  void draw_tile(DrawingContext& context, unsigned int id,
+      const Vector& pos, int layer);
+  
+  static std::set<TileGroup>* tilegroups() { if(!instance_) { instance_ = new TileManager(); } return tilegroups_ ? tilegroups_ : tilegroups_ = new std::set<TileGroup>; }
   Tile* get(unsigned int id) {
     if(id < tiles.size())
       {