X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.h;h=55eddfce3f0a182aa94b945d6565c3e5e49711fd;hb=ad4cc7039db0c05354df820cbd62f5ca7e651193;hp=0403e2f624d0d2730500a5d9f8bae95f160dcdef;hpb=45d21c1c59a58aa557b62d3aa22ba89a975e323c;p=supertux.git diff --git a/src/worldmap.h b/src/worldmap.h index 0403e2f62..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); @@ -199,6 +198,9 @@ private: Vector offset; std::string savegame_file; + + std::string intro_filename; + bool intro_displayed; void get_level_title(Level& level); @@ -224,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);