fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / tile.hpp

diff --git a/src/tile.hpp b/src/tile.hpp
index 3197021..c03154f 100644 (file)
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -1,7 +1,8 @@
 //  $Id$
-// 
+//
 //  SuperTux
 //  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,7 +13,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -22,6 +23,7 @@
 
 #include <vector>
 #include <SDL.h>
+#include <stdint.h>
 #include "video/surface.hpp"
 #include "math/rect.hpp"
 #include "lisp/lisp.hpp"
@@ -36,29 +38,33 @@ class Tile
 public:
   /// bitset for tile attributes
   enum {
-    /** solid tile that is indestructable by Tux */                         
+    /** 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,
+    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
@@ -67,10 +73,17 @@ public:
     WORLDMAP_SOUTH = 0x0002,
     WORLDMAP_EAST  = 0x0004,
     WORLDMAP_WEST  = 0x0008,
-    
-    WORLDMAP_STOP  = 0x0010
+
+    WORLDMAP_STOP  = 0x0010,
+
+    // convenience values ("C" stands for crossroads)
+    WORLDMAP_CNSE  = WORLDMAP_NORTH | WORLDMAP_SOUTH | WORLDMAP_EAST,
+    WORLDMAP_CNSW  = WORLDMAP_NORTH | WORLDMAP_SOUTH | WORLDMAP_WEST,
+    WORLDMAP_CNEW  = WORLDMAP_NORTH | WORLDMAP_EAST  | WORLDMAP_WEST,
+    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)
@@ -86,29 +99,24 @@ private:
   std::vector<ImageSpec> imagespecs;
   std::vector<Surface*> images;
 
-  std::string editor_imagefile;
-  Surface* editor_image;
-  
-  /** tile attributes */
-  Uint32 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;
+  /** Draw a tile on the screen */
+  void draw(DrawingContext& context, const Vector& pos, int z_pos) const;
 
   unsigned int getID() const
   { return id; }
 
-  Uint32 getAttributes() const
+  uint32_t getAttributes() const
   { return attributes; }
 
   int getData() const
@@ -116,7 +124,7 @@ public:
 
   /// returns the width of the tile in pixels
   int getWidth() const
-  { 
+  {
     if(!images.size())
       return 0;
     return (int) images[0]->get_width();