diff --git a/src/play_controller.cpp b/src/play_controller.cpp index 73ed657b3041..3752b92f7fa9 100644 --- a/src/play_controller.cpp +++ b/src/play_controller.cpp @@ -319,9 +319,7 @@ void play_controller::save_map(){ void play_controller::load_game(){ savegame::loadgame load(*gui_, game_config_, saved_game_); - load.load_game(game::load_game_exception::game, game::load_game_exception::show_replay, game::load_game_exception::cancel_orders, game::load_game_exception::select_difficulty, game::load_game_exception::difficulty); - - throw game::load_game_exception(filename_, show_replay_, cancel_orders_, select_difficulty_, difficulty_); + load.load_game(); } void play_controller::preferences(){ diff --git a/src/savegame.cpp b/src/savegame.cpp index 2fe4e843d166..6e1adcf39254 100644 --- a/src/savegame.cpp +++ b/src/savegame.cpp @@ -166,8 +166,9 @@ void loadgame::show_difficulty_dialog() difficulty_ = difficulties[difficulty_dlg.selected_index()]; } -/* Called only by play_controller to handle in-game attempts to load. Instead of returning true, - throws a "load_game_exception" to signal a resulting load game request. + +// Called only by play_controller to handle in-game attempts to load. Instead of returning true, +// throws a "load_game_exception" to signal a resulting load game request. bool loadgame::load_game() { show_dialog(false, false); @@ -198,7 +199,7 @@ bool loadgame::load_game() } throw game::load_game_exception(filename_, show_replay_, cancel_orders_, select_difficulty_, difficulty_); -} */ +} bool loadgame::load_game( const std::string& filename diff --git a/src/savegame.hpp b/src/savegame.hpp index b5fc59347681..77860a905b8e 100644 --- a/src/savegame.hpp +++ b/src/savegame.hpp @@ -41,6 +41,8 @@ class loadgame loadgame(display& gui, const config& game_config, saved_game& gamestate); virtual ~loadgame() {} + /** Load a game without providing any information. */ + bool load_game(); /** Load a game with pre-setting information for the load-game dialog. A value of false will cause the save to not load. */ bool load_game(