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

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/03/16 20:31:29

Modified files:
        src            : multiplayer_connect.cpp 

Log message:
        fix controllers being reset if loading a game

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

Patches:
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.123 
wesnoth/src/multiplayer_connect.cpp:1.124
--- wesnoth/src/multiplayer_connect.cpp:1.123   Wed Mar 16 19:49:17 2005
+++ wesnoth/src/multiplayer_connect.cpp Wed Mar 16 20:31:29 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.123 2005/03/16 19:49:17 j_daniel Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.124 2005/03/16 20:31:29 j_daniel Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -46,7 +46,6 @@
        cfg_(cfg),
 
        index_(index),
-       controller_(parent_->default_controller_),
 
        player_number_(parent.disp(), 
lexical_cast_default<std::string>(index+1, ""),
                        font::SIZE_XLARGE, font::GOOD_COLOUR),
@@ -64,6 +63,17 @@
        enabled_(!parent_->params_.saved_game),
        changed_(false)
 {
+       if(enabled_) {
+               controller_ = parent_->default_controller_;
+       } else {
+               for(size_t i = CNTR_NETWORK; i != CNTR_LAST; ++i) {
+                       if(cfg_["controller"] == controller_names[i]) {
+                               controller_ = (mp::controller)i;
+                               break;
+                       }
+               }
+       }
+       
        SDL_Rect r;
        r.w = 120;
        r.h = 16;