[netPanzer-CVS] netpanzer/src/NetPanzer/Views/MainMenu MenuTemp...

[Ivo Danihelka]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Ivo Danihelka <address@hidden>  03/10/15 17:16:33

Modified files:
        src/NetPanzer/Views/MainMenu: MenuTemplateView.cpp 
        src/NetPanzer/Views/MainMenu/Multi: IPAddressView.cpp 
                                            PlayerNameView.cpp 

Log message:
        Fixed playerName load from config.
        Fixed visibility of IPAddressView in second attempt.

Patches:
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.19 
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.20
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.19    Mon Oct 
13 10:30:21 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp Wed Oct 15 
17:16:33 2003
@@ -71,6 +71,7 @@
         //Desktop::setVisibility("UnitSelectionView", true);
         Desktop::setVisibility("FlagSelectionView", true);
         Desktop::setVisibility("PlayerNameView", true);
+        Desktop::setVisibility("IPAddressView", true);
     } else {
         assert(false);
     }
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp:1.11 
netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp:1.12
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp:1.11 Mon Oct 
13 10:30:22 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp      Wed Oct 
15 17:16:33 2003
@@ -103,7 +103,7 @@
 {
     szServer.init("  ", 100);
     addInputField(iXY(10, 80), &szServer, "", true);
-} // end PlayerNameView::init
+} // end IPAddressView::init
 
 
 
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp:1.6 
netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp:1.7
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp:1.6 Mon Oct 
13 10:30:23 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp     Wed Oct 
15 17:16:33 2003
@@ -50,7 +50,7 @@
 //---------------------------------------------------------------------------
 void PlayerNameView::init()
 {
-    playerName.init("Player", INPUT_FIELD_CHARACTERS);
+    playerName.init(std::string(gameconfig->playername).c_str(), 
INPUT_FIELD_CHARACTERS);
     addInputField(iXY(BORDER_SPACE, BORDER_SPACE), &playerName, "", true);
 
 } // end PlayerNameView::init