- Implemented a scripted object that can be placed in a level and whose name is

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index 01d0bfa..8c19d74 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -26,14 +26,13 @@
 #include "audio/musicref.h"
 #include "video/screen.h"
 #include "lisp/lisp.h"
+#include "control/controller.h"
 #include "statistics.h"
 #include "timer.h"
 #include "tile_manager.h"
 
-namespace SuperTux {
-  class Menu;
-}
-
+class Sprite;
+class Menu;
 extern Menu* worldmap_menu;
 
 namespace WorldMapNS {
@@ -66,9 +65,8 @@ public:
   Direction back_direction;
 private:
   WorldMap* worldmap;
-  Surface* largetux_sprite;
-  Surface* firetux_sprite;
-  Surface* smalltux_sprite;
+  Sprite* tux_sprite;
+  Controller* controller;
 
   Direction input_direction;
   Direction direction;
@@ -83,7 +81,7 @@ public:
   Tux(WorldMap* worldmap_);
   ~Tux();
   
-  void draw(DrawingContext& context, const Vector& offset);
+  void draw(DrawingContext& context);
   void action(float elapsed_time);
 
   void set_direction(Direction dir);
@@ -180,7 +178,7 @@ public:
   };
 
   /** Variables to deal with the passive map messages */
-  Timer2 passive_message_timer;
+  Timer passive_message_timer;
   std::string passive_message;
 
 private:
@@ -195,8 +193,6 @@ private:
 
   MusicRef song;
 
-  bool enter_level;
-
   Vector offset;
   std::string savegame_file;
   
@@ -227,7 +223,7 @@ public:
   void update(float delta);
 
   /** Draw one frame */
-  void draw(DrawingContext& context, const Vector& offset);
+  void draw(DrawingContext& context);
 
   Vector get_next_tile(Vector pos, Direction direction);
   const Tile* at(Vector pos);