upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-14 09:30:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Game Launcher: make use of optional::emplace"

Browse Source 
This reverts commit 3c4239acce. Needs C++20 for paren aggregate initialization...
This commit is contained in:
Charles Dang 2025-03-11 05:11:58 -04:00
parent 3c4239acce
commit d9ba97f3b2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/game_launcher.cpp
View File

@ -148,7 +148,8 @@ game_launcher::game_launcher(const commandline_options& cmdline_opts)
if(cmdline_opts_.editor) {
jump_to_editor_ = true;
if(!cmdline_opts_.editor->empty()) {
load_data_.emplace(savegame::save_index_class::default_saves_dir(), *cmdline_opts_.editor);
load_data_ = savegame::load_game_metadata{
savegame::save_index_class::default_saves_dir(), *cmdline_opts_.editor};
}
}
if(cmdline_opts_.fps)
@ -156,7 +157,8 @@ game_launcher::game_launcher(const commandline_options& cmdline_opts)
if(cmdline_opts_.fullscreen)
prefs::get().set_fullscreen(true);
if(cmdline_opts_.load)
load_data_.emplace(savegame::save_index_class::default_saves_dir(), *cmdline_opts_.load);
load_data_ = savegame::load_game_metadata{
savegame::save_index_class::default_saves_dir(), *cmdline_opts_.load};
if(cmdline_opts_.max_fps) {
prefs::get().set_refresh_rate(std::clamp(*cmdline_opts_.max_fps, 1, 1000));
}
@ -532,8 +534,8 @@ game_launcher::unit_test_result game_launcher::single_unit_test()
savegame::replay_savegame save(state_, compression::format::none);
save.save_game_automatic(false, "unit_test_replay");
load_data_.emplace(
savegame::save_index_class::default_saves_dir(), save.filename(), "", true, true, false);
load_data_ = savegame::load_game_metadata{
savegame::save_index_class::default_saves_dir(), save.filename(), "", true, true, false};
if(!load_game()) {
PLAIN_LOG << "Failed to load the replay!";