X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.hpp;h=d7e3d233ff3d979001ef9154857aeb85e1ec8e55;hb=d753e2c21ae6af1fb8876529695dcc7f6a46e5f0;hp=88ed0551fc68069c606c421459b44be1d7df622e;hpb=6ae2d154b976957d8e209bb991672b0c12c503c7;p=supertux.git

diff --git a/src/tile.hpp b/src/tile.hpp
index 88ed0551f..d7e3d233f 100644
--- 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
@@ -72,8 +73,15 @@ 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 {
@@ -91,10 +99,7 @@ private:
   std::vector<ImageSpec> imagespecs;
   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)*/
@@ -106,9 +111,7 @@ public:
   ~Tile();
   
   /** Draw a tile on the screen */
-  void draw(DrawingContext& context, const Vector& pos, int layer) const;
-
-  Surface* get_editor_image() const;
+  void draw(DrawingContext& context, const Vector& pos, int z_pos) const;
 
   unsigned int getID() const
   { return id; }