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

[Matthias Braun]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Matthias Braun <address@hidden> 03/10/03 10:53:38

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

Log message:
        more small cleanups

Patches:
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.56 
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.57
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.56     Fri Oct  3 
10:45:10 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp  Fri Oct  3 10:53:37 2003
@@ -73,7 +73,6 @@
 // ** GVS Includes
 #include "codewiz.hpp"
 #include "cMouse.hpp"
-#include "loadPics.hpp"
 #include "Palette.hpp"
 #include "Desktop.hpp"
 #include "GameView.hpp"
@@ -200,7 +199,6 @@
     loadPalette("wads/netp.act");
     
     initFont();
-    loadPics();
 
     gameView.init();
     Desktop::add( &gameView );
@@ -324,12 +322,8 @@
 
     Palette::setBrightnessAbsolute(GameConfig::getScreenBrightness());
 
-    Palette pal;
-
-    // Screen->palette.loadLibPalette(pal, Screen->lpFrontBuffer);
-    Screen->setPalette(pal.color);
+    Screen->setPalette(Palette::color);
     ConsoleInterface::postMessage( "Increasing Brightness");
-
 } // end increaseBrightness
 
 // ******************************************************************
@@ -339,22 +333,14 @@
 
     Palette::setBrightnessAbsolute(GameConfig::getScreenBrightness());
 
-    Palette pal;
-
-    // Screen->palette.loadLibPalette(pal, Screen->lpFrontBuffer);
-    Screen->setPalette(pal.color);
+    Screen->setPalette(Palette::color);
     ConsoleInterface::postMessage( "Decreasing Brightness");
-
 } // end increaseBrightness
 
-
 // ******************************************************************
 void GameManager::initializeInputDevices()
 {
-    setupKeyboardBindings();
-
     MouseInterface::initialize();
-    mouse.setPointer(&mouseArrow);
 }
 
 void GameManager::shutdownInputDevices()
@@ -467,15 +453,6 @@
 
 // ******************************************************************
 
-void GameManager::setupKeyboardBindings()
-{
-#if 0
-    KEY_BINDER.bindAction( _action_rank_view, "RankView", SDLK_F6 );
-    KEY_BINDER.bindAction( _action_chat_view, "ChatView", SDLK_F7 );
-    KEY_BINDER.bindAction( _action_mini_map, "MiniMapView", SDLK_F8 );
-#endif
-}
-
 void GameManager::processSystemKeys()
 {
     static bool toggleBot = false;
@@ -1220,25 +1197,9 @@
 
     progressView.open();
 
-    //winsock hack
-    //fix dialup problem--
-    //Screen->setGDIStatus(true);
-    //minimize = MinimizeOrNot( gapp.hwndApp );
-
     /*
     initializeConnectionType();
     HostSession( gapp.hwndApp );                 
-
-    if (minimize == false)
-    { 
-      Screen->setGDIStatus(false);
-    }  
-    else
-     {
-      OpenIcon( gapp.hwndApp ); 
-      Screen->restoreAll();
-      Screen->setGDIStatus( FALSE ); 
-     }
     */
 
     //InitStreamServer(gapp.hwndApp);
@@ -1335,23 +1296,7 @@
     //reinitializeGameLogic();
     NetworkState::setNetworkStatus( _network_state_client );
 
-    //winsock hack
-    //JoinSession( gapp.hwndApp );
-    //InitStreamClient(gapp.hwndApp);
     CLIENT->joinSession(IPAddressView::szServer.getString());
-
-    // XXX how should that work? we can't process (network) events while 
waiting
-#if 0
-    Timer wait;
-    if ( CLIENT->joinSession() == false ) {
-        lobbyView.scrollAndUpdate( "FAILED TO JOIN NETPANZER SESSION" );
-        wait.changePeriod( 4 );
-        while( !wait.count() );
-
-        lobbyView.toggleMainMenu();
-        return;
-    }
-#endif
 
     ClientConnectDaemon::startConnectionProcess();
     sound->playTankIdle();
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.13 
netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.14
--- netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.13     Fri Oct  3 
10:45:10 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.hpp  Fri Oct  3 10:53:38 2003
@@ -104,8 +104,6 @@
     static void dedicatedSimLoop();
     static void dedicatedInputLoop();
 
-    static void setupKeyboardBindings();
-
     static bool startGameMapLoad(const char *map_file_path, unsigned long 
partitions, int *result_code );
     static bool gameMapLoad( int *percent_complete );
     static void finishGameMapLoad();