0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes bug #5817 (turns for sides with no remaining units)

Browse source
This commit is contained in:
Jörg Hinrichs 2006-04-24 16:39:06 +00:00
parent 2de8e4d201
commit 4f5f90aecc
2 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
src/play_controller.cpp
View file

@ -291,58 +291,55 @@ void play_controller::init_side(const unsigned int team_index){
log_scope("player turn");
team& current_team = teams_[team_index];
//if a side is dead, don't do their turn
if(!current_team.is_empty() || team_units(units_,player_number_) == 0) {
if(team_manager_.is_observer()) {
gui_->set_team(size_t(team_index));
}
if(team_manager_.is_observer()) {
gui_->set_team(size_t(team_index));
}
std::stringstream player_number_str;
player_number_str << player_number_;
gamestate_.set_variable("side_number",player_number_str.str());
std::stringstream player_number_str;
player_number_str << player_number_;
gamestate_.set_variable("side_number",player_number_str.str());
//fire side turn event only if real side change occurs not counting changes from void to a side
if (team_index != (first_player_ - 1) || status_.turn() > start_turn_) {
game_events::fire("side turn");
}
//fire side turn event only if real side change occurs not counting changes from void to a side
if (team_index != (first_player_ - 1) || status_.turn() > start_turn_) {
game_events::fire("side turn");
}
//we want to work out if units for this player should get healed, and the
//player should get income now. healing/income happen if it's not the first
//turn of processing, or if we are loading a game, and this is not the
//player it started with.
const bool turn_refresh = status_.turn() > start_turn_ || loading_game_ && team_index != (first_player_ - 1);
//we want to work out if units for this player should get healed, and the
//player should get income now. healing/income happen if it's not the first
//turn of processing, or if we are loading a game, and this is not the
//player it started with.
const bool turn_refresh = status_.turn() > start_turn_ || loading_game_ && team_index != (first_player_ - 1);
if(turn_refresh) {
for(unit_map::iterator i = units_.begin(); i != units_.end(); ++i) {
if(i->second.side() == (size_t)player_number_) {
i->second.new_turn(i->first);
}
if(turn_refresh) {
for(unit_map::iterator i = units_.begin(); i != units_.end(); ++i) {
if(i->second.side() == (size_t)player_number_) {
i->second.new_turn(i->first);
}
current_team.new_turn();
//if the expense is less than the number of villages owned,
//then we don't have to pay anything at all
const int expense = team_upkeep(units_,player_number_);
if(expense > 0) {
current_team.spend_gold(expense);
}
calculate_healing((*gui_),status_,map_,units_,player_number_,teams_, !recorder.is_skipping());
reset_resting(units_, player_number_);
}
current_team.set_time_of_day(int(status_.turn()),status_.get_time_of_day());
current_team.new_turn();
gui_->set_playing_team(size_t(team_index));
if (!recorder.is_skipping()){
::clear_shroud(*gui_,status_,map_,gameinfo_,units_,teams_,team_index);
//if the expense is less than the number of villages owned,
//then we don't have to pay anything at all
const int expense = team_upkeep(units_,player_number_);
if(expense > 0) {
current_team.spend_gold(expense);
}
if (!recorder.is_skipping()){
gui_->scroll_to_leader(units_, player_number_);
}
calculate_healing((*gui_),status_,map_,units_,player_number_,teams_, !recorder.is_skipping());
reset_resting(units_, player_number_);
}
current_team.set_time_of_day(int(status_.turn()),status_.get_time_of_day());
gui_->set_playing_team(size_t(team_index));
if (!recorder.is_skipping()){
::clear_shroud(*gui_,status_,map_,gameinfo_,units_,teams_,team_index);
}
if (!recorder.is_skipping()){
gui_->scroll_to_leader(units_, player_number_);
}
}

37
src/playsingle_controller.cpp
View file

@ -324,28 +324,31 @@ void playsingle_controller::play_turn(){
LOG_NG << "turn: " << status_.turn() << "\n";
for(player_number_ = first_player_; player_number_ <= teams_.size(); player_number_++) {
init_side(player_number_ - 1);
//if a side is dead, don't do their turn
if(!teams_[player_number_ - 1].is_empty() && team_units(units_,player_number_) > 0) {
init_side(player_number_ - 1);
if (replaying_){
const hotkey::basic_handler key_events_handler(gui_);
LOG_NG << "doing replay " << player_number_ << "\n";
try {
replaying_ = ::do_replay(*gui_,map_,gameinfo_,units_,teams_,
player_number_,status_,gamestate_);
} catch(replay::error&) {
gui::show_dialog(*gui_,NULL,"",_("The file you have tried to load is corrupt"),gui::OK_ONLY);
if (replaying_){
const hotkey::basic_handler key_events_handler(gui_);
LOG_NG << "doing replay " << player_number_ << "\n";
try {
replaying_ = ::do_replay(*gui_,map_,gameinfo_,units_,teams_,
player_number_,status_,gamestate_);
} catch(replay::error&) {
gui::show_dialog(*gui_,NULL,"",_("The file you have tried to load is corrupt"),gui::OK_ONLY);
replaying_ = false;
replaying_ = false;
}
LOG_NG << "result of replay: " << (replaying_?"true":"false") << "\n";
}
LOG_NG << "result of replay: " << (replaying_?"true":"false") << "\n";
}
if (!replaying_){
play_side(player_number_);
}
if (!replaying_){
play_side(player_number_);
}
finish_side_turn();
check_victory(units_,teams_);
finish_side_turn();
check_victory(units_,teams_);
}
}
//time has run out