Author: soliton
Date: Sat Nov 1 13:03:42 2008
New Revision: 30489
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30489&view=rev
Log:
always check for a leader when trying to rename one
Modified:
trunk/src/playturn.cpp
Modified: trunk/src/playturn.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playturn.cpp?rev=30489&r1=30488&r2=30489&view=diff
==============================================================================
--- trunk/src/playturn.cpp (original)
+++ trunk/src/playturn.cpp Sat Nov 1 13:03:42 2008
@@ -207,8 +207,7 @@
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;
@@ -261,18 +260,16 @@
case 0:
teams_[side_index].make_human_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);
change_controller(side_str, "human_ai");
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;
@@ -291,7 +288,7 @@
} else {
teams_[side_index].make_human_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);
change_controller(side_str,
"human_ai");
}
return
restart?PROCESS_RESTART_TURN:PROCESS_CONTINUE;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
