X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fworldmap%2Fworldmap.cpp;fp=src%2Fworldmap%2Fworldmap.cpp;h=0b9a4775139cf50279c6dfe71283c37e6a9ba55f;hb=04270f0886aa08cb8fee7dba58d41975ddb1cb72;hp=9f71f16eb780eafc320801a3ee9acbc653ec3892;hpb=7532d474f5a450576181138b577cb9328d8d802c;p=supertux.git diff --git a/src/worldmap/worldmap.cpp b/src/worldmap/worldmap.cpp index 9f71f16eb..0b9a47751 100644 --- a/src/worldmap/worldmap.cpp +++ b/src/worldmap/worldmap.cpp @@ -40,18 +40,20 @@ #include "object/decal.hpp" #include "object/tilemap.hpp" #include "physfs/ifile_streambuf.hpp" +#include "scripting/scripting.hpp" #include "scripting/squirrel_error.hpp" #include "scripting/squirrel_util.hpp" #include "sprite/sprite.hpp" #include "sprite/sprite_manager.hpp" #include "supertux/game_session.hpp" #include "supertux/globals.hpp" -#include "supertux/screen_manager.hpp" #include "supertux/menu/menu_storage.hpp" #include "supertux/menu/options_menu.hpp" #include "supertux/menu/worldmap_menu.hpp" #include "supertux/player_status.hpp" #include "supertux/resources.hpp" +#include "supertux/savegame.hpp" +#include "supertux/screen_manager.hpp" #include "supertux/sector.hpp" #include "supertux/shrinkfade.hpp" #include "supertux/spawn_point.hpp" @@ -59,7 +61,6 @@ #include "supertux/tile_manager.hpp" #include "supertux/tile_set.hpp" #include "supertux/world.hpp" -#include "supertux/savegame.hpp" #include "util/file_system.hpp" #include "util/gettext.hpp" #include "util/log.hpp" @@ -72,6 +73,7 @@ #include "worldmap/tux.hpp" #include "worldmap/worldmap.hpp" + static const float CAMERA_PAN_SPEED = 5.0; namespace worldmap {