X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsupertux%2Fgame_session.cpp;h=3ddedfcf7bd0dfc7aa282bd803efd2f349a05cd5;hb=1f40c3162dad16f31085234080f5fad3c4d7a8c7;hp=028d51c8e22572316720d58d45fbafdd028173c4;hpb=8c15498863fba06e554f72e8b7fad16e99c6c3d4;p=supertux.git diff --git a/src/supertux/game_session.cpp b/src/supertux/game_session.cpp index 028d51c8e..3ddedfcf7 100644 --- a/src/supertux/game_session.cpp +++ b/src/supertux/game_session.cpp @@ -34,13 +34,14 @@ #include "supertux/gameconfig.hpp" #include "supertux/globals.hpp" #include "supertux/levelintro.hpp" +#include "supertux/levelset_screen.hpp" #include "supertux/menu/menu_storage.hpp" #include "supertux/menu/options_menu.hpp" #include "supertux/player_status.hpp" +#include "supertux/savegame.hpp" #include "supertux/screen_fade.hpp" #include "supertux/screen_manager.hpp" #include "supertux/sector.hpp" -#include "supertux/savegame.hpp" #include "util/file_system.hpp" #include "util/gettext.hpp" #include "worldmap/worldmap.hpp" @@ -409,7 +410,6 @@ GameSession::setup() void GameSession::leave() { - m_savegame.save(); } void @@ -417,7 +417,15 @@ GameSession::update(float elapsed_time) { // handle controller if(g_input_manager->get_controller()->pressed(Controller::PAUSE_MENU)) + { on_escape_press(); + } + + if(g_input_manager->get_controller()->pressed(Controller::CHEAT_MENU)) + { + game_pause = true; + MenuManager::instance().set_menu(MenuStorage::CHEAT_MENU); + } process_events(); MenuManager::instance().check_menu(); @@ -494,7 +502,14 @@ GameSession::finish(bool win) if(win) { if(WorldMap::current()) + { WorldMap::current()->finished_level(level.get()); + } + + if (LevelsetScreen::current()) + { + LevelsetScreen::current()->finished_level(win); + } } g_screen_manager->pop_screen();