X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.hpp;h=2f57f3d1884a415df5943ccdf24f29fd0c37392e;hb=8b8e1c3576cedddb1d88eafa5fd4804e8257793c;hp=e1b57f4b318d3bcc1de004145d58414bc33c4f06;hpb=e58a0205a8836820b53a7b875942bae7b0e629fd;p=supertux.git

diff --git a/src/tile.hpp b/src/tile.hpp
index e1b57f4b3..2f57f3d18 100644
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -26,8 +26,10 @@
 #include <stdint.h>
 #include "video/surface.hpp"
 #include "math/rect.hpp"
-#include "lisp/lisp.hpp"
 
+namespace lisp { class Lisp; }
+
+class TileSet;
 class DrawingContext;
 
 /**
@@ -38,7 +40,7 @@ class Tile
 public:
   /// bitset for tile attributes
   enum {
-    /** solid tile that is indestructable by Tux */
+    /** solid tile that is indestructible by Tux */
     SOLID     = 0x0001,
     /** uni-directional solid tile */
     UNISOLID  = 0x0002,
@@ -75,6 +77,7 @@ public:
     WORLDMAP_SOUTH = 0x0002,
     WORLDMAP_EAST  = 0x0004,
     WORLDMAP_WEST  = 0x0008,
+    WORLDMAP_DIR_MASK = 0x000f,
 
     WORLDMAP_STOP  = 0x0010,
 
@@ -96,10 +99,9 @@ public:
   };
 
 private:
-  unsigned int id;
-
+  const TileSet         *tileset;
   std::vector<ImageSpec> imagespecs;
-  std::vector<Surface*> images;
+  std::vector<Surface*>  images;
 
   /// tile attributes
   uint32_t attributes;
@@ -115,9 +117,6 @@ public:
   /** Draw a tile on the screen */
   void draw(DrawingContext& context, const Vector& pos, int z_pos) const;
 
-  unsigned int getID() const
-  { return id; }
-
   uint32_t getAttributes() const
   { return attributes; }
 
@@ -141,15 +140,20 @@ public:
   }
 
 protected:
-  friend class TileManager;
-  Tile();
-  Tile(unsigned int id, Uint32 attributes, const ImageSpec& imagespec);
+  friend class TileSet;
+  Tile(const TileSet *tileset);
+  Tile(const TileSet *tileset, std::vector<std::string> images, Rect rect,
+     Uint32 attributes = 0, Uint32 data = 0, float animfps = 1.0);
 
-  void load_images(const std::string& tilesetpath);
+  void load_images();
 
   /// parses the tile and returns it's id number
-  void parse(const lisp::Lisp& reader);
+  uint32_t parse(const lisp::Lisp& reader);
   void parse_images(const lisp::Lisp& cur);
+
+  //Correct small oddities in attributes that naive people
+  //might miss (and rebuke them for it)
+  void correct_attributes();
 };
 
 #endif