Make Tux run automatically. As before, if he is carrying something Tux

[supertux.git] / src / object / tilemap.hpp

diff --git a/src/object/tilemap.hpp b/src/object/tilemap.hpp
index 20969bd..73c0f57 100644 (file)
--- a/src/object/tilemap.hpp
+++ b/src/object/tilemap.hpp
@@ -74,7 +74,7 @@ public:
   /** resizes the tilemap to a new width and height (tries to not destroy the
    * existing map)
    */
-  void resize(int newwidth, int newheight);
+  void resize(int newwidth, int newheight, int fill_id = 0);
 
   size_t get_width() const
   { return width; }
@@ -100,6 +100,11 @@ public:
   bool is_solid() const
   { return solid; }
 
+  /**
+   * Changes Tilemap's solidity, i.e. whether to consider it when doing collision detection.
+   */
+  void set_solid(bool solid = true);
+
   /// returns tile in row y and column y (of the tilemap)
   const Tile* get_tile(int x, int y) const;
   /// returns tile at position pos (in world coordinates)
@@ -140,7 +145,8 @@ private:
 private:
   TileManager* tilemanager;
   bool solid;
-  float speed;
+  float speed_x;
+  float speed_y;
   int width, height;
   int z_pos;
   float x_offset;
@@ -153,6 +159,8 @@ private:
   
   std::auto_ptr<Path> path;
   std::auto_ptr<PathWalker> walker;
+
+  DrawingContext::Target draw_target; /**< set to LIGHTMAP to draw to lightmap */
 };
 
 #endif /*SUPERTUX_TILEMAP_H*/