diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp index 6adab4d2ccec..fd490fbbdd31 100644 --- a/src/game_launcher.cpp +++ b/src/game_launcher.cpp @@ -667,8 +667,7 @@ bool game_launcher::load_game() DBG_GENERAL << "Current campaign type: " << state_.classification().campaign_type << std::endl; - savegame::loadgame load( - savegame::save_index_class::default_saves_dir(), game_config_manager::get()->game_config(), state_); + savegame::loadgame load(savegame::save_index_class::default_saves_dir(), state_); if(load_data_) { load.data() = std::move(load_data_.value()); clear_loaded_game(); diff --git a/src/gui/dialogs/multiplayer/mp_create_game.cpp b/src/gui/dialogs/multiplayer/mp_create_game.cpp index beb1857eae20..66f281a4519b 100644 --- a/src/gui/dialogs/multiplayer/mp_create_game.cpp +++ b/src/gui/dialogs/multiplayer/mp_create_game.cpp @@ -781,7 +781,7 @@ void mp_create_game::update_map_settings() void mp_create_game::load_game_callback() { - savegame::loadgame load(savegame::save_index_class::default_saves_dir(), cfg_, create_engine_.get_state()); + savegame::loadgame load(savegame::save_index_class::default_saves_dir(), create_engine_.get_state()); if(!load.load_multiplayer_game()) { return; diff --git a/src/play_controller.cpp b/src/play_controller.cpp index 8a6e3b3facba..cd0b903487a7 100644 --- a/src/play_controller.cpp +++ b/src/play_controller.cpp @@ -915,7 +915,7 @@ void play_controller::save_map() void play_controller::load_game() { - savegame::loadgame load(savegame::save_index_class::default_saves_dir(), game_config_, saved_game_); + savegame::loadgame load(savegame::save_index_class::default_saves_dir(), saved_game_); load.load_game_ingame(); } diff --git a/src/savegame.cpp b/src/savegame.cpp index ce14087e681e..0ce8b9e8e429 100644 --- a/src/savegame.cpp +++ b/src/savegame.cpp @@ -46,6 +46,7 @@ #include "game_version.hpp" #include "video.hpp" #include "game_config_view.hpp" +#include "game_config_manager.hpp" #include #include @@ -81,8 +82,8 @@ void clean_saves(const std::string& label) } } -loadgame::loadgame(const std::shared_ptr& index, const game_config_view& game_config, saved_game& gamestate) - : game_config_(game_config) +loadgame::loadgame(const std::shared_ptr& index, saved_game& gamestate) + : game_config_(game_config_manager::get()->game_config()) , gamestate_(gamestate) , load_data_{index} { diff --git a/src/savegame.hpp b/src/savegame.hpp index 67defa5c8178..f6f1108e8934 100644 --- a/src/savegame.hpp +++ b/src/savegame.hpp @@ -99,7 +99,7 @@ class load_game_exception class loadgame { public: - loadgame(const std::shared_ptr& index, const game_config_view& game_config, saved_game& gamestate); + loadgame(const std::shared_ptr& index, saved_game& gamestate); virtual ~loadgame() {} /* In any of the following three function, a bool value of false indicates