added a powerup object that can be placed in levels and represent various powerups...

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

diff --git a/src/object/tilemap.h b/src/object/tilemap.h
index 2ffa804..d647a5e 100644 (file)
--- a/src/object/tilemap.h
+++ b/src/object/tilemap.h
@@ -16,14 +16,13 @@
 //  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  02111-1307, USA.
-
 #ifndef SUPERTUX_TILEMAP_H
 #define SUPERTUX_TILEMAP_H
 
 #include <vector>
 #include <stdint.h>
 
-#include "special/game_object.h"
+#include "game_object.h"
 #include "serializable.h"
 #include "math/vector.h"
 
@@ -31,8 +30,6 @@ namespace lisp {
 class Lisp;
 }
 
-using namespace SuperTux;
-
 class Level;
 class TileManager;
 class Tile;
@@ -44,13 +41,13 @@ class TileMap : public GameObject, public Serializable
 {
 public:
   TileMap();
-  TileMap(const lisp::Lisp& reader);
+  TileMap(const lisp::Lisp& reader, TileManager* tile_manager = 0);
   TileMap(int layer_, bool solid_, size_t width_, size_t height_);
   virtual ~TileMap();
 
   virtual void write(lisp::Writer& writer);
 
-  virtual void action(float elapsed_time);
+  virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
 
   void set(int width, int height, const std::vector<unsigned int>& vec,