this time 1-hole problems are fixed for real

[supertux.git] / src / tile.h

diff --git a/src/tile.h b/src/tile.h
index 6af2fd2..f943a23 100644 (file)
--- a/src/tile.h
+++ b/src/tile.h
@@ -25,8 +25,11 @@
 #include "SDL.h"
 #include "video/surface.h"
 
-class Vector;
+using namespace SuperTux;
+
+namespace SuperTux {
 class LispReader;
+}
 
 /**
 Tile Class
@@ -38,9 +41,9 @@ public:
   ~Tile();
 
   /// parses the tile and returns it's id number
-  int read(LispReader& reader);
+  void read(LispReader& reader);
 
-  int id;
+  unsigned int id;
 
   std::vector<Surface*> images;
   std::vector<Surface*> editor_images;
@@ -67,7 +70,9 @@ public:
        * if data is 0 then the endsequence should be triggered, if data is 1
        * then we can finish the level instantly.
        */
-      GOAL      = 0x0100
+      GOAL      = 0x0100,
+      /** slope tile */
+      SLOPE     = 0x0200
   };
 
   /** tile attributes */
@@ -80,13 +85,10 @@ public:
       been collected or jumped at */
   int next_tile;
 
-  int anim_speed;
+  float anim_fps;
 
-  /** This is the angle of the slope. Set to 0, if this is no slope. */
-  float slope_angle;
-  
-  /** Draw a tile on the screen: */
-  static void draw(const Vector& pos, unsigned int c, Uint8 alpha = 255);
+  /** Draw a tile on the screen */
+  void draw(DrawingContext& context, const Vector& pos, int layer) const;
 
   /// returns the width of the tile in pixels
   int getWidth() const