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

[Ivo Danihelka]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Ivo Danihelka <address@hidden>  03/09/23 18:53:55

Modified files:
        src/NetPanzer/Interfaces: GameManager.cpp 

Log message:
        Better code for fullscreen

Patches:
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.53 
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.54
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.53     Tue Sep 23 
18:51:03 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp  Tue Sep 23 18:53:55 2003
@@ -495,15 +495,6 @@
         Bot::bot()->processEvents();
     }
 
-    // Alt+Enter fullscreen
-    if (KeyboardInterface::getKeyPressed(SDLK_RETURN)
-            && (KeyboardInterface::getKeyState(SDLK_RALT)
-                || KeyboardInterface::getKeyState(SDLK_LALT)))
-    {
-        GameConfig::setFullscreen(!Screen->isFullScreen());
-        GameManager::setVideoMode();
-    }
-
     if (Desktop::getVisible("GameView")) {
 
         if (KeyboardInterface::getKeyPressed( SDLK_F5 )) {
@@ -523,8 +514,13 @@
 
     }
 
-    if (       KeyboardInterface::getKeyState( SDLK_LALT ) ||
+    if (KeyboardInterface::getKeyState( SDLK_LALT ) ||
             KeyboardInterface::getKeyState( SDLK_RALT )) {
+        if (KeyboardInterface::getKeyPressed(SDLK_RETURN)) {
+            GameConfig::setFullscreen(!Screen->isFullScreen());
+            GameManager::setVideoMode();
+        }
+
         if ( KeyboardInterface::getKeyPressed( SDLK_MINUS) ) {
             if (!Desktop::getVisible("GameView")) {
                 decreaseBrightness("wads/netpmenu.act");