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

[Ivo Danihelka]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Ivo Danihelka <address@hidden>  03/10/23 20:22:26

Modified files:
        src/NetPanzer/Views/MainMenu/Multi: FlagSelectionView.cpp 
                                            HostJoinTemplateView.cpp 

Log message:
        Fixed loading playerflag settings

Patches:
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.14 
netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.15
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.14     
Mon Oct 13 10:30:21 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp  Thu Oct 
23 20:22:26 2003
@@ -21,6 +21,7 @@
 #include "GameView.hpp"
 #include "GameViewGlobals.hpp"
 #include "Exception.hpp"
+#include "GameConfig.hpp"
 
 Surface playerFlag;
 int     playerFlagSelected = 0;
@@ -94,6 +95,7 @@
     }
 
     playerFlag.setFrame(0);
+    playerFlagSelected = gameconfig->playerflag;
 
 } // end FlagSelectionView::init
 
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
diff -u 
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.17 
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.18
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.17  
Wed Oct 22 09:19:32 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp       
Thu Oct 23 20:22:26 2003
@@ -90,7 +90,7 @@
     gameconfig->playername = PlayerNameView::playerName.getString();
 
     // Set the player flag.
-    gameconfig->playerflag = ( (short) playerFlagSelected );
+    gameconfig->playerflag = playerFlagSelected;
 
     if (gameconfig->hostorjoin == _game_session_join) {
         //winsock hack