[Wesnoth-cvs-commits] wesnoth/src playturn.cpp

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/06/03 11:52:51

Modified files:
        src            : playturn.cpp 

Log message:
        ok last fix for #13264 wasn't working now it really works

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.373&tr2=1.374&r1=text&r2=text

Patches:
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.373 wesnoth/src/playturn.cpp:1.374
--- wesnoth/src/playturn.cpp:1.373      Fri Jun  3 10:44:59 2005
+++ wesnoth/src/playturn.cpp    Fri Jun  3 11:52:50 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.373 2005/06/03 10:44:59 j_daniel Exp $ */
+/* $Id: playturn.cpp,v 1.374 2005/06/03 11:52:50 j_daniel Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -2544,11 +2544,15 @@
                        const std::string player(j+1,data.end());
                        const int side_num = lexical_cast<int, 
std::string>(side);
                        if(side_num > 0 && side_num <= teams_.size()) {
-                               teams_[static_cast<size_t>(side_num - 
1)].make_network();
-                               change_side_controller(side,player);
-                               close_textbox();
-                               if(team_num_ == side_num) {
-                                       throw end_turn_exception(side_num);
+                               if(teams_[static_cast<size_t>(side_num - 
1)].is_human()) {
+                                       
change_side_controller(side,player,true);
+                                       if(team_num_ == side_num) {
+                                               
teams_[static_cast<size_t>(side_num - 1)].make_network();
+                                               close_textbox();
+                                               throw 
end_turn_exception(side_num);
+                                       }
+                               } else {
+                                       change_side_controller(side,player);
                                }
                        }
                }