Author: soliton
Date: Sat Nov 1 12:38:09 2008
New Revision: 30488
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30488&view=rev
Log:
always check for a leader when trying to rename one
Modified:
branches/1.4/src/playturn.cpp
Modified: branches/1.4/src/playturn.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/playturn.cpp?rev=30488&r1=30487&r2=30488&view=diff
==============================================================================
--- branches/1.4/src/playturn.cpp (original)
+++ branches/1.4/src/playturn.cpp Sat Nov 1 12:38:09 2008
@@ -202,8 +202,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;
@@ -256,17 +255,15 @@
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 @@
} 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;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
