Author: anonymissimus
Date: Tue May 3 03:38:41 2011
New Revision: 49346
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49346&view=rev
Log:
play at least side=1's turn in case all sides are dead (fix for bug #17995)
Modified:
trunk/src/playsingle_controller.cpp
Modified: trunk/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=49346&r1=49345&r2=49346&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Tue May 3 03:38:41 2011
@@ -569,8 +569,10 @@
replaying_ = ::do_replay(player_number_);
LOG_NG << "result of replay: " <<
(replaying_?"true":"false") << "\n";
} else {
- // If a side is dead end the turn.
- if (current_team().is_human() &&
side_units(player_number_) == 0)
+ // If a side is dead end the turn, but play at least
side=1's
+ // turn in case all sides are dead
+ if (current_team().is_human() &&
side_units(player_number_) == 0
+ && (resources::units->size() != 0 ||
player_number_ != 1))
{
turn_info turn_data(player_number_,
replay_sender_);
recorder.end_turn();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
