Skip to content

Commit

Permalink
Revert "apply a blindfold during skip replays"
Browse files Browse the repository at this point in the history
This reverts commit b0023b7.
The earlier commit was supposed to be on a testing branch...
my apologies, this change would not be appropriate during
feature freeze.
  • Loading branch information
cbeck88 committed Mar 1, 2014
1 parent 2fb13f8 commit ba6d58c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
6 changes: 2 additions & 4 deletions src/playmp_controller.cpp
Expand Up @@ -45,15 +45,14 @@ playmp_controller::playmp_controller(const config& level,
turn_data_(NULL),
beep_warning_time_(0),
network_processing_stopped_(false),
blindfold_(*resources::screen,blindfold_replay_),
skip_replays_blindfold_(*resources::screen,skip_replay)
blindfold_(*resources::screen,blindfold_replay_)
{
is_host_ = is_host;
// We stop quick replay if play isn't yet past turn 1
if ( replay_last_turn_ <= 1)
{
skip_replay_ = false;
skip_replays_blindfold_.unblind();
blindfold_.unblind();
} else if (blindfold_replay_) {
//blindfold_ = resources::screen->video().lock_updates(true);
LOG_NG << " *** Putting on the blindfold now " << std::endl;
Expand Down Expand Up @@ -459,7 +458,6 @@ void playmp_controller::play_network_turn(){
if (skip_replay_) {
skip_replay_ = false;
}
skip_replays_blindfold_.unblind();
}
const turn_info::PROCESS_DATA_RESULT result = turn_data.process_network_data(cfg, from, data_backlog_, skip_replay_);
if (result == turn_info::PROCESS_RESTART_TURN) {
Expand Down
1 change: 0 additions & 1 deletion src/playmp_controller.hpp
Expand Up @@ -66,7 +66,6 @@ class playmp_controller : public playsingle_controller, public events::pump_moni
int beep_warning_time_;
mutable bool network_processing_stopped_;
blindfold blindfold_;
blindfold skip_replays_blindfold_;
private:
void set_end_scenario_button();
void reset_end_scenario_button();
Expand Down

0 comments on commit ba6d58c

Please sign in to comment.