Console commands can pass arguments

[supertux.git] / src / tile.hpp

diff --git a/src/tile.hpp b/src/tile.hpp
index ed1196e..88ed055 100644 (file)
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -21,10 +21,14 @@
 #define TILE_H
 
 #include <vector>
+#include <SDL.h>
+#include <stdint.h>
 #include "video/surface.hpp"
 #include "math/rect.hpp"
 #include "lisp/lisp.hpp"
 
+class DrawingContext;
+
 /**
 Tile Class
 */
@@ -39,23 +43,27 @@ public:
     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,
+    GOAL      = 0x0008,
     /** slope tile */
-    SLOPE     = 0x0200,
+    SLOPE     = 0x0010,
+    /** Bonusbox, content is stored in \a data */
+    FULLBOX   = 0x0020,
+    /** Tile is a coin */
+    COIN      = 0x0040,
+
+    /* 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 */                         
+    WATER     = 0x0200,
+    /** a tile that hurts the player if he touches it */
+    HURTS     = 0x0400,
   };
 
   /// worldmap flags
@@ -68,9 +76,6 @@ public:
     WORLDMAP_STOP  = 0x0010
   };
   
-private:
-  unsigned int id;
-
   struct ImageSpec {
     ImageSpec(const std::string& newfile, const Rect& newrect)
       : file(newfile), rect(newrect)
@@ -79,6 +84,10 @@ private:
     std::string file;
     Rect rect;
   };
+
+private:
+  unsigned int id;
+
   std::vector<ImageSpec> imagespecs;
   std::vector<Surface*> images;
 
@@ -86,7 +95,7 @@ private:
   Surface* editor_image;
   
   /** tile attributes */
-  Uint32 attributes;
+  uint32_t attributes;
   
   /** General purpose data attached to a tile (content of a box, type of coin)*/
   int data;
@@ -104,7 +113,7 @@ public:
   unsigned int getID() const
   { return id; }
 
-  Uint32 getAttributes() const
+  uint32_t getAttributes() const
   { return attributes; }
 
   int getData() const
@@ -115,7 +124,7 @@ public:
   { 
     if(!images.size())
       return 0;
-    return images[0]->w;
+    return (int) images[0]->get_width();
   }
 
   /// returns the height of the tiles in pixels
@@ -123,12 +132,13 @@ public:
   {
     if(!images.size())
       return 0;
-    return images[0]->h;
+    return (int) images[0]->get_height();
   }
 
 protected:
   friend class TileManager;
   Tile();
+  Tile(unsigned int id, Uint32 attributes, const ImageSpec& imagespec);
 
   void load_images(const std::string& tilesetpath);