X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.h;h=55eddfce3f0a182aa94b945d6565c3e5e49711fd;hb=3ca25f16f12442ad698973cf3e282ae6a7f664c9;hp=80585ea226b66f255347f4f3e7820c9214a76b87;hpb=ef57479f613b900b73eba8e8f4d026aae0de25cc;p=supertux.git

diff --git a/src/worldmap.h b/src/worldmap.h
index 80585ea22..55eddfce3 100644
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -32,6 +32,7 @@
 
 namespace SuperTux {
   class Menu;
+  class Sprite;
 }
 
 extern Menu* worldmap_menu;
@@ -66,9 +67,7 @@ public:
   Direction back_direction;
 private:
   WorldMap* worldmap;
-  Surface* largetux_sprite;
-  Surface* firetux_sprite;
-  Surface* smalltux_sprite;
+  Sprite* tux_sprite;
 
   Direction input_direction;
   Direction direction;
@@ -83,7 +82,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);
@@ -185,6 +184,7 @@ public:
 
 private:
   std::string map_filename;
+  std::string levels_path;
 
   typedef std::vector<SpecialTile> SpecialTiles;
   SpecialTiles special_tiles;
@@ -198,6 +198,9 @@ private:
 
   Vector offset;
   std::string savegame_file;
+  
+  std::string intro_filename;
+  bool intro_displayed;
 
   void get_level_title(Level& level);
 
@@ -223,7 +226,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);