Permalink
Browse files

don't display network_ai sides as replacements for dropped sides

after 18829 fix, don't display "network_ai" sides as possible
controllers for a dropped side, as all ai sides now have this value.
  • Loading branch information...
1 parent 736ceaa commit b854aab437f157eea642131b882a4987a95c5b6b @cbeck88 cbeck88 committed Mar 17, 2014
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/playturn.cpp
View
@@ -244,7 +244,7 @@ turn_info::PROCESS_DATA_RESULT turn_info::process_network_data(const config& cfg
const bool have_leader = leader.valid();
if (controller == "ai"){
- tm.make_ai();
+ tm.make_network_ai();
tm.set_current_player("ai" + side_drop);
if (have_leader) leader->rename("ai" + side_drop);
return restart?PROCESS_RESTART_TURN:PROCESS_CONTINUE;
@@ -278,7 +278,7 @@ turn_info::PROCESS_DATA_RESULT turn_info::process_network_data(const config& cfg
//get all allies in as options to transfer control
BOOST_FOREACH(team &t, *resources::teams)
{
- if (!t.is_enemy(side) && !t.is_human() && !t.is_ai() && !t.is_empty()
+ if (!t.is_enemy(side) && !t.is_human() && !t.is_ai() && !t.is_network_ai() && !t.is_empty()
&& t.current_player() != tm.current_player())
{
//if this is an ally of the dropping side and it is not us (choose local player

0 comments on commit b854aab

Please sign in to comment.