upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-06 04:01:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Game Launcher: moved outtro handling to campaign_controller

Browse Source
This commit is contained in:
Charles Dang 2021-01-07 02:18:42 +11:00
parent 321b496362
commit 39ca794c2a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/game_initialization/playcampaign.cpp
View File

@ -31,6 +31,7 @@
#include "generators/map_generator.hpp" #include "generators/map_generator.hpp"
#include "gettext.hpp" #include "gettext.hpp"
#include "gui/dialogs/message.hpp" #include "gui/dialogs/message.hpp"
#include "gui/dialogs/outro.hpp"
#include "gui/dialogs/transient_message.hpp" #include "gui/dialogs/transient_message.hpp"
#include "gui/widgets/retval.hpp" #include "gui/widgets/retval.hpp"
#include "log.hpp" #include "log.hpp"
@ -335,6 +336,14 @@ LEVEL_RESULT campaign_controller::play_game()
// If there is no next scenario we're done now. // If there is no next scenario we're done now.
if(state_.get_scenario_id().empty()) { if(state_.get_scenario_id().empty()) {
// Don't show The End for multiplayer scenarios.
if(res == LEVEL_RESULT::VICTORY && !state_.classification().is_normal_mp_game()) {
preferences::add_completed_campaign(
state_.classification().campaign, state_.classification().difficulty);
gui2::dialogs::outro::display(state_.classification());
}
return res; return res;
} else if(res == LEVEL_RESULT::OBSERVER_END && mp_info_ && !mp_info_->is_host) { } else if(res == LEVEL_RESULT::OBSERVER_END && mp_info_ && !mp_info_->is_host) {
const int dlg_res = gui2::show_message(_("Game Over"), const int dlg_res = gui2::show_message(_("Game Over"),

8
src/game_launcher.cpp
View File

@ -36,7 +36,6 @@
#include "gui/dialogs/multiplayer/mp_connect.hpp" #include "gui/dialogs/multiplayer/mp_connect.hpp"
#include "gui/dialogs/multiplayer/mp_host_game_prompt.hpp" // for host game prompt #include "gui/dialogs/multiplayer/mp_host_game_prompt.hpp" // for host game prompt
#include "gui/dialogs/multiplayer/mp_method_selection.hpp" #include "gui/dialogs/multiplayer/mp_method_selection.hpp"
#include "gui/dialogs/outro.hpp"
#include "gui/dialogs/title_screen.hpp" // for show_debug_clock_button #include "gui/dialogs/title_screen.hpp" // for show_debug_clock_button
#include "gui/dialogs/transient_message.hpp" // for show_transient_message #include "gui/dialogs/transient_message.hpp" // for show_transient_message
#include "gui/widgets/retval.hpp" // for window, etc #include "gui/widgets/retval.hpp" // for window, etc
@ -990,13 +989,6 @@ void game_launcher::launch_game(RELOAD_GAME_DATA reload)
campaign_controller ccontroller(state_); campaign_controller ccontroller(state_);
LEVEL_RESULT result = ccontroller.play_game(); LEVEL_RESULT result = ccontroller.play_game();
ai::manager::singleton_ = nullptr; ai::manager::singleton_ = nullptr;
// don't show The End for multiplayer scenario
// change this if MP campaigns are implemented
if(result == LEVEL_RESULT::VICTORY && !state_.classification().is_normal_mp_game()) {
preferences::add_completed_campaign(state_.classification().campaign, state_.classification().difficulty);
gui2::dialogs::outro::display(state_.classification());
}
} catch(savegame::load_game_exception& e) { } catch(savegame::load_game_exception& e) {
load_data_ = std::move(e.data_); load_data_ = std::move(e.data_);
// this will make it so next time through the title screen loop, this game is loaded // this will make it so next time through the title screen loop, this game is loaded