[netPanzer-CVS] netpanzer/src/NetPanzer Interfaces/GameManager....

[Matthias Braun]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Matthias Braun <address@hidden> 03/09/22 11:30:28

Modified files:
        src/NetPanzer/Interfaces: GameManager.cpp 
        src/NetPanzer/Views/MainMenu: MenuTemplateView.cpp 

Log message:
        fixed the main menu problems in higher resolutions

Patches:
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.49 
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.50
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.49     Mon Sep 22 
09:53:52 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp  Mon Sep 22 11:30:27 2003
@@ -563,7 +563,6 @@
         }
 
         if (KeyboardInterface::getKeyPressed(SDLK_F2)) {
-            printf("ShowMenu!\n");
             if (Desktop::getView("GameView")->getVisible()) {
                 if (!Desktop::getView("OptionsView")->getVisible() &&
                         !Desktop::getView("SoundView")->getVisible() &&
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.14 
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.15
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.14    Sun Sep 
21 14:29:33 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp Mon Sep 22 
11:30:27 2003
@@ -33,6 +33,7 @@
 #include "PackedSurface.hpp"
 #include "UtilInterface.hpp"
 #include "GameManager.hpp"
+#include "UILib/UIDraw.hpp"
 #include "Exception.hpp"
 #include "GameViewGlobals.hpp"
 
@@ -215,7 +216,6 @@
 void MenuTemplateView::doDraw(const Surface &viewArea, const Surface 
&clientArea)
 {
     //setWorldRect();
-
     if (Desktop::getVisible("GameView")) {
        // When ingame, tint the game into gray
         clientArea.bltLookup(getClientRect(), 
Palette::darkGray256.getColorArray());
@@ -223,7 +223,11 @@
 
     } else {
        // When in mainmenu, make background dark and draw menu image
-       
+        if(Screen->getWidth() > 640 ||
+           Screen->getHeight() > 480)
+            screen.fillRect(0, 0, Screen->getWidth(), Screen->getHeight(),
+                            Color::black);
+        
         // Set the following to get does exist.
         if (backgroundSurface.getFrameCount() > 0) {
             backgroundSurface.blt(viewArea, 0, 0);