From 9c6b5df2311eb55cf8e9788e6934c30454a30a0c Mon Sep 17 00:00:00 2001 From: gfgtdf Date: Sat, 27 Dec 2014 22:09:24 +0100 Subject: [PATCH] maybe fix mp campaign define follows the suggestion in the first reply in https://gna.org/bugs/index.php?23036. --- src/multiplayer_wait.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/multiplayer_wait.cpp b/src/multiplayer_wait.cpp index 51bf47586b92..50bcd69a48cd 100644 --- a/src/multiplayer_wait.cpp +++ b/src/multiplayer_wait.cpp @@ -220,11 +220,7 @@ void wait::join_game(bool observe) if (!download_res) { set_result(QUIT); return; - } else if (!level_["allow_new_game"].to_bool(true)) { - set_result(PLAY); - return; } - if (first_scenario_) { state_ = game_state(); state_.classification().campaign_type = "multiplayer"; @@ -246,6 +242,11 @@ void wait::join_game(bool observe) load_game_config_for_game(state_.classification()); } + if (!level_["allow_new_game"].to_bool(true)) { + set_result(PLAY); + return; + } + // Add the map name to the title. append_to_title(": " + level_["name"].t_str());