X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.hpp;h=2f57f3d1884a415df5943ccdf24f29fd0c37392e;hb=fb8cef6efacc0dff5faaff6dc4aa638289285099;hp=fd1f69a63a944305f3c4dd34f21e30208b3936be;hpb=0d4be1a5fadf30244c41188f114f83c818ece9bc;p=supertux.git

diff --git a/src/tile.hpp b/src/tile.hpp
index fd1f69a63..2f57f3d18 100644
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -40,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,
@@ -77,7 +77,7 @@ public:
     WORLDMAP_SOUTH = 0x0002,
     WORLDMAP_EAST  = 0x0004,
     WORLDMAP_WEST  = 0x0008,
-	WORLDMAP_DIR_MASK = 0x000f,
+    WORLDMAP_DIR_MASK = 0x000f,
 
     WORLDMAP_STOP  = 0x0010,
 
@@ -142,13 +142,18 @@ public:
 protected:
   friend class TileSet;
   Tile(const TileSet *tileset);
-  Tile(const TileSet *tileset, Uint32 attributes, const ImageSpec& imagespec);
+  Tile(const TileSet *tileset, std::vector<std::string> images, Rect rect,
+     Uint32 attributes = 0, Uint32 data = 0, float animfps = 1.0);
 
   void load_images();
 
   /// parses the tile and returns it's id number
   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