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

always check for a leader when trying to rename one

Browse source
This commit is contained in:
Gunter Labes 2008-11-01 11:38:09 +00:00
parent 00e2d8655c
commit afc39b880d
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/playturn.cpp
View file

@ -202,8 +202,7 @@ turn_info::PROCESS_DATA_RESULT turn_info::process_network_data(const config& cfg
if (controller == "ai"){
teams_[side_index].make_ai();
teams_[side_index].set_current_player("ai"+side_str);
if(have_leader)
leader->second.rename("ai"+side_str);
if(have_leader) leader->second.rename("ai"+side_str);
return restart?PROCESS_RESTART_TURN:PROCESS_CONTINUE;
@ -256,17 +255,15 @@ turn_info::PROCESS_DATA_RESULT turn_info::process_network_data(const config& cfg
case 0:
teams_[side_index].make_ai();
teams_[side_index].set_current_player("ai"+side_str);
if(have_leader)
leader->second.rename("ai"+side_str);
if(have_leader) leader->second.rename("ai"+side_str);
return restart?PROCESS_RESTART_TURN:PROCESS_CONTINUE;
//we don't have to test have_leader as action > 0 mean have_leader == true
case 1:
teams_[side_index].make_human();
teams_[side_index].set_current_player("human"+side_str);
leader->second.rename("human"+side_str);
if(have_leader) leader->second.rename("human"+side_str);
return restart?PROCESS_RESTART_TURN:PROCESS_CONTINUE;
@ -285,7 +282,7 @@ turn_info::PROCESS_DATA_RESULT turn_info::process_network_data(const config& cfg
} else {
teams_[side_index].make_ai();
teams_[side_index].set_current_player("ai"+side_str);
leader->second.rename("ai"+side_str);
if(have_leader) leader->second.rename("ai"+side_str);
}
return restart?PROCESS_RESTART_TURN:PROCESS_CONTINUE;
}