X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.hpp;h=2f57f3d1884a415df5943ccdf24f29fd0c37392e;hb=d280c800be43b01c92ce31dca9d0a290220e63dd;hp=07b57d997c87fc2fa6c3ea6ec175bf6eb4fe8723;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/tile.hpp b/src/tile.hpp
index 07b57d997..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,
@@ -58,13 +60,15 @@ public:
 
     /* interesting flags (the following are passed to gameobjects) */
     FIRST_INTERESTING_FLAG = 0x0100,
-    
+
     /** an ice brick that makes tux sliding more than usual */
     ICE       = 0x0100,
-    /** a water tile in which tux starts to swim */                         
+    /** a water tile in which tux starts to swim */
     WATER     = 0x0200,
     /** a tile that hurts the player if he touches it */
     HURTS     = 0x0400,
+    /** for lava: WATER, HURTS, FIRE */
+    FIRE      = 0x0800
   };
 
   /// worldmap flags
@@ -73,6 +77,7 @@ public:
     WORLDMAP_SOUTH = 0x0002,
     WORLDMAP_EAST  = 0x0004,
     WORLDMAP_WEST  = 0x0008,
+    WORLDMAP_DIR_MASK = 0x000f,
 
     WORLDMAP_STOP  = 0x0010,
 
@@ -83,7 +88,7 @@ public:
     WORLDMAP_CSEW  = WORLDMAP_SOUTH | WORLDMAP_EAST  | WORLDMAP_WEST,
     WORLDMAP_CNSEW = WORLDMAP_NORTH | WORLDMAP_SOUTH | WORLDMAP_EAST | WORLDMAP_WEST
   };
-  
+
   struct ImageSpec {
     ImageSpec(const std::string& newfile, const Rect& newrect)
       : file(newfile), rect(newrect)
@@ -94,32 +99,23 @@ public:
   };
 
 private:
-  unsigned int id;
-
+  const TileSet         *tileset;
   std::vector<ImageSpec> imagespecs;
-  std::vector<Surface*> images;
+  std::vector<Surface*>  images;
 
-  std::string editor_imagefile;
-  Surface* editor_image;
-  
-  /** tile attributes */
+  /// tile attributes
   uint32_t attributes;
-  
+
   /** General purpose data attached to a tile (content of a box, type of coin)*/
   int data;
-  
+
   float anim_fps;
 
 public:
   ~Tile();
-  
-  /** Draw a tile on the screen */
-  void draw(DrawingContext& context, const Vector& pos, int layer) const;
-
-  Surface* get_editor_image() const;
 
-  unsigned int getID() const
-  { return id; }
+  /** Draw a tile on the screen */
+  void draw(DrawingContext& context, const Vector& pos, int z_pos) const;
 
   uint32_t getAttributes() const
   { return attributes; }
@@ -129,7 +125,7 @@ public:
 
   /// returns the width of the tile in pixels
   int getWidth() const
-  { 
+  {
     if(!images.size())
       return 0;
     return (int) images[0]->get_width();
@@ -144,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