[netPanzer-CVS] netpanzer/src/NetPanzer/Views/Game GameInfoView...

[Hankin Chick]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Hankin Chick <address@hidden>   03/11/22 05:00:22

Modified files:
        src/NetPanzer/Views/Game: GameInfoView.cpp GameToolbarView.cpp 
                                  MiniMapView.cpp 

Log message:
        fixes for previous patch, didn't save window positions for new users

Patches:
Index: netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.13 
netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.14
--- netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.13    Sat Nov 22 
04:46:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp Sat Nov 22 05:00:22 2003
@@ -82,10 +82,10 @@
 
     if(!gameconfig->configfileexists) {
         // Start it in the top-left corner.
-        moveTo(screen->getPixX() - getSize().x, 0);
-    } else {
-        moveTo(gameconfig->gameinfoposition); 
+        iXY pos(screen->getPixX() - getSize().x,0);
+        gameconfig->gameinfoposition=pos;
     }
+    moveTo(gameconfig->gameinfoposition); 
     checkArea(screen->getPix());
 } // end GameInfoView::GameInfoView
 
Index: netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp:1.9 
netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp:1.10
--- netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp:1.9  Sat Nov 22 
04:46:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp      Sat Nov 22 
05:00:22 2003
@@ -216,12 +216,12 @@
 
     resizeClientArea(iXY(117, pos.y));
 
-    if(gameconfig->configfileexists) {
-        moveTo(gameconfig->toolbarposition);
-    } else {
+    if(!gameconfig->configfileexists) {
         // Start it in the bottom-left corner.
-        moveTo(screen->getPix() - getSize());
+        iXY pos=screen->getPix() - getSize();
+        gameconfig->toolbarposition=pos;
     }
+    moveTo(gameconfig->toolbarposition);
     checkArea(screen->getPix());
 } // end GameToolbarView::GameToolbarView
 
Index: netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.22 
netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.23
--- netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.22     Sat Nov 22 
04:46:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp  Sat Nov 22 05:00:22 2003
@@ -68,7 +68,7 @@
     if(gameconfig->configfileexists) {
         moveTo(gameconfig->minimapposition);
     } else {
-        moveTo(iXY(0, screen->getPix().y - 196));
+        moveTo(gameconfig->minimapposition=iXY(0, screen->getPix().y - 196));
     }
 
     //int xOffset = size.x;