Author: anonymissimus
Date: Thu May 17 22:19:01 2012
New Revision: 54194

URL: http://svn.gna.org/viewcvs/wesnoth?rev=54194&view=rev
Log:
let play_controller::player_number_ have the last side's side_number

after the loop over the sides' turns. (fix for bug #19735)

Backported from trunk r54193

Modified:
    branches/1.10/src/playsingle_controller.cpp

Modified: branches/1.10/src/playsingle_controller.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.10/src/playsingle_controller.cpp?rev=54194&r1=54193&r2=54194&view=diff
==============================================================================
--- branches/1.10/src/playsingle_controller.cpp (original)
+++ branches/1.10/src/playsingle_controller.cpp Thu May 17 22:19:01 2012
@@ -605,6 +605,10 @@
                //if loading a savegame, network turns might not have reset 
this yet
                loading_game_ = false;
        }
+       //If the loop exits due to the last team having been processed,
+       //player_number_ will be 1 too high
+       if(player_number_ > static_cast<int>(teams_.size()))
+               player_number_ = teams_.size();
 
        finish_turn();
 


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to