[netPanzer-CVS] netpanzer/src NetPanzer/Classes/TileEngine.cpp ...

[Matthias Braun]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Matthias Braun <address@hidden> 03/09/06 17:05:27

Modified files:
        src/NetPanzer/Classes: TileEngine.cpp 
        src/NetPanzer/Interfaces: GameManager.cpp 
        src/UILib/SDL  : SDLSound.cpp 

Log message:
        disabled TileEngine::drawWorld code and fixed some small bugs => the 
game starts now (when you host a session) and works as you'd expect a game 
without blitters to work :)

Patches:
Index: netpanzer/src/NetPanzer/Classes/TileEngine.cpp
diff -u netpanzer/src/NetPanzer/Classes/TileEngine.cpp:1.4 
netpanzer/src/NetPanzer/Classes/TileEngine.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/TileEngine.cpp:1.4  Sat Sep  6 07:04:14 2003
+++ netpanzer/src/NetPanzer/Classes/TileEngine.cpp      Sat Sep  6 17:05:26 2003
@@ -21,8 +21,10 @@
 #include "DDHardSurface.hpp"
 
 void TileEngine::blitWorld( void )
- {
-
+{
+ // XXX disabled for now until the assembler blitters are converted
+ // and the global vars (DBUFFER_VIEW_WIDTH, ...) are implemented
+#if 0
  unsigned long  x_left_length, x_left_offset, x_right_length, x_right_offset;
  unsigned long  y_top_length, y_top_offset, y_bottom_length, y_bottom_offset;
  bool        x_right_end_flag, y_bottom_end_flag;
@@ -285,5 +287,5 @@
     }
 
   }
-
+#endif
  }
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.18 
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.19
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.18     Sat Sep  6 
16:49:45 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp  Sat Sep  6 17:05:27 2003
@@ -220,11 +220,12 @@
     sound = new DirectSound(); 
 #endif
 #ifdef USE_SDL
+       LOG( ("Initialize sound system.") );
        sound = new SDLSound();
 #endif
     if (!sound || !sound->initialize())
     {
-               LOG( ( "Failure to initialize DirectSound Sub-system" ) );
+               LOG( ( "Failed to initialize the Sound Sub-system" ) );
                delete sound;
                sound = 0;
     } 
@@ -235,6 +236,7 @@
 void GameManager::shutdownSoundSubSystem()
 {
        if(sound) {
+               LOG( ("shutdown sound system.") );
                sound->shutdown();
                delete sound;
                sound = 0;
Index: netpanzer/src/UILib/SDL/SDLSound.cpp
diff -u netpanzer/src/UILib/SDL/SDLSound.cpp:1.1 
netpanzer/src/UILib/SDL/SDLSound.cpp:1.2
--- netpanzer/src/UILib/SDL/SDLSound.cpp:1.1    Sat Sep  6 13:16:44 2003
+++ netpanzer/src/UILib/SDL/SDLSound.cpp        Sat Sep  6 17:05:27 2003
@@ -12,7 +12,7 @@
 
 bool SDLSound::initialize()
 {
-       return false;
+       return true;
 }
 
 void SDLSound::shutdown()