X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.h;h=f943a2395be5ca826a1275396cb0d02d2c91472c;hb=875ef8eb7e93726bc67dfa7f05da946250e588d4;hp=b95842288c35bf80dd3d5a03f053857787b68108;hpb=2ec1be264110139466ab70422b8f4fd9c22e5c8c;p=supertux.git

diff --git a/src/tile.h b/src/tile.h
index b95842288..f943a2395 100644
--- a/src/tile.h
+++ b/src/tile.h
@@ -21,12 +21,15 @@
 #ifndef TILE_H
 #define TILE_H
 
-#include <map>
 #include <vector>
-#include "texture.h"
-#include "globals.h"
-#include "lispreader.h"
-#include "setup.h"
+#include "SDL.h"
+#include "video/surface.h"
+
+using namespace SuperTux;
+
+namespace SuperTux {
+class LispReader;
+}
 
 /**
 Tile Class
@@ -37,81 +40,73 @@ public:
   Tile();
   ~Tile();
 
-  int id;
+  /// parses the tile and returns it's id number
+  void read(LispReader& reader);
+
+  unsigned 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,
+      /** slope tile */
+      SLOPE     = 0x0200
+  };
+
+  /** 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
       been collected or jumped at */
   int next_tile;
 
-  int anim_speed;
-  
-  /** Draw a tile on the screen: */
-  static void draw(float x, float y, unsigned int c, Uint8 alpha = 255);
-};
+  float anim_fps;
 
-struct TileGroup
-{
-  std::string name;
-  std::vector<int> tiles;
-};
+  /** Draw a tile on the screen */
+  void draw(DrawingContext& context, const Vector& pos, int layer) const;
 
-class TileManager
-{
- private:
-  TileManager();
-  ~TileManager();
-  
-  std::vector<Tile*> tiles;
-  static TileManager* instance_ ;
-  static std::vector<TileGroup>* tilegroups_;
-  void load_tileset(std::string filename);
+  /// returns the width of the tile in pixels
+  int getWidth() const
+  { 
+    if(!images.size())
+      return 0;
+    return images[0]->w;
+  }
 
-  std::string current_tileset;
-  
- public:
-  static TileManager* instance() { return instance_ ? instance_ : instance_ = new TileManager(); }
-  static void destroy_instance() { delete instance_; instance_ = 0; }
-  
-  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]; 
-      } 
+  /// returns the height of the tiles in pixels
+  int getHeight() const
+  {
+    if(!images.size())
+      return 0;
+    return images[0]->h;
   }
 };
 
 #endif
+
+/* EOF */