fixes bug #6411 - quick replay causes false skip in subsequent game

This commit is contained in:
Patrick Parker 2006-07-24 00:20:36 +00:00
parent a74cad12ee
commit 82d6e991af
2 changed files with 4 additions and 0 deletions

View File

@ -24,6 +24,7 @@
#include "multiplayer_create.hpp"
#include "network.hpp"
#include "playcampaign.hpp"
#include "playmp_controller.hpp"
#include "preferences.hpp"
#include "preferences_display.hpp"
#include "random.hpp"
@ -425,6 +426,7 @@ void start_server(display& disp, const config& game_config, game_data& data,
const set_random_generator generator_setter(&recorder);
mp::chat chat;
config gamelist;
playmp_controller::set_replay_last_turn(0);
enter_create_mode(disp, game_config, data, chat, gamelist, default_controller, is_server);
}
@ -444,6 +446,7 @@ void start_client(display& disp, const config& game_config, game_data& data,
enter_lobby_mode(disp, game_config, data, chat, gamelist);
break;
case SIMPLE_SERVER:
playmp_controller::set_replay_last_turn(0);
enter_wait_mode(disp, game_config, data, chat, gamelist, false);
break;
case ABORT_SERVER:

View File

@ -527,6 +527,7 @@ void lobby::process_event()
const bool observe = (observe_game_.pressed() || (games_menu_.selected() && !games_menu_.selection_is_joinable())) && games_menu_.selection_is_observable();
const bool join = (join_game_.pressed() || games_menu_.selected()) && games_menu_.selection_is_joinable();
preferences::set_skip_mp_replay(skip_replay_.checked());
playmp_controller::set_replay_last_turn(0);
if(join || observe) {
const config* game = gamelist().child("gamelist");