[netPanzer-CVS] netpanzer/src DirectX/DDraw/DirectDraw.cpp Dire...

[Tyler Nielsen]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Tyler Nielsen <address@hidden>  03/08/31 20:03:03

Modified files:
        src/DirectX/DDraw: DirectDraw.cpp DirectDraw.hpp 
                           DirectDrawPalette.cpp DirectDrawPalette.hpp 
                           DirectDrawglobals.hpp 
        src/Lib        : Stdafx.hpp 
        src/NetPanzer/Classes: DDHardSurface.cpp 
        src/NetPanzer/Core: netPanzerWinMain.cpp netPanzerWinMain.h 
                            netPanzerWinProc.cpp 
        src/NetPanzer/Interfaces: GameManager.cpp NetworkClientDPlay.cpp 
                                  NetworkServerDPlay.cpp 
        src/NetPanzer/Resources: netPanzer.aps 
        src/NetPanzer/Views/Game: LobbyView.cpp ProgressView.cpp 
        src/Workspace/netPanzerBuildTree/netPanzer: netPanzer.dsp 
        src/Workspace/netPanzerBuildTree/netPanzerSetup: 
                                                         netPanzerSetup.dsp 
Added files:
        src/UILib      : UIDraw.cpp UIDraw.hpp 
        src/UILib/SDL  : SDLDraw.cpp SDLDraw.hpp 

Log message:
        First cut at SDL Video stuff.
        Default is still to use DirectX (Change in src/UILib/UIDraw.cpp)

Patches:
Index: netpanzer/src/DirectX/DDraw/DirectDraw.cpp
diff -u netpanzer/src/DirectX/DDraw/DirectDraw.cpp:1.1 
netpanzer/src/DirectX/DDraw/DirectDraw.cpp:1.2
--- netpanzer/src/DirectX/DDraw/DirectDraw.cpp:1.1      Sun Dec  1 12:19:35 2002
+++ netpanzer/src/DirectX/DDraw/DirectDraw.cpp  Sun Aug 31 20:03:02 2003
@@ -43,8 +43,6 @@
 
 //extern globalApp gapp;
 
-DirectDraw DDraw;
-
 unsigned char *DOUBLE_BUFFER = NULL;
 
 unsigned long DBUFFER_WIDTH;
@@ -369,6 +367,11 @@
        rect->bottom = DBufferDesc.height - DBufferDesc.y_clip_offset;
        rect->right  = DBufferDesc.width;   
 } // end getViewableRect
+
+void DirectDraw::setPalette(RGBColor *color)
+{
+               palette.loadLibPalette(color, lpFrontBuffer);
+}
 
 // setVideoMode
 //---------------------------------------------------------------------------
Index: netpanzer/src/DirectX/DDraw/DirectDraw.hpp
diff -u netpanzer/src/DirectX/DDraw/DirectDraw.hpp:1.1 
netpanzer/src/DirectX/DDraw/DirectDraw.hpp:1.2
--- netpanzer/src/DirectX/DDraw/DirectDraw.hpp:1.1      Sun Dec  1 12:19:35 2002
+++ netpanzer/src/DirectX/DDraw/DirectDraw.hpp  Sun Aug 31 20:03:02 2003
@@ -21,6 +21,7 @@
 
 #include "stdafx.hpp"
 #include "DirectDrawPalette.hpp"
+#include "UIDraw.hpp"
 
 
 enum { VIDEO_MODE_WINDOWED          = 0x01,
@@ -57,11 +58,8 @@
  
 // DirectDraw class declarations
 //---------------------------------------------------------------------------
-class DirectDraw
+class DirectDraw: public UIDraw
 {
-public:
-       DirectDrawPalette palette;
-    
 protected:
        int defaultVideoMode;
     
@@ -93,9 +91,10 @@
     
     HRESULT DDBltRects( LPDIRECTDRAWSURFACE pSrc, LPDIRECTDRAWSURFACE pDest,
                         long nRects, RECT *pSrcRects, RECT *pDestRects       );
+
+       DirectDrawPalette palette;
                
 
-public:
        //directdraw surface description--
        DDSURFACEDESC DDPrimaryDesc;
        DDSURFACEDESC DDDoubleBuffDesc;
@@ -116,6 +115,8 @@
        
        DisplayMode currentDisplayMode;
 
+public:
+
        DirectDraw();
                        
        BOOL initialize();
@@ -139,6 +140,8 @@
   void loadPaletteACT(char *filename);
   void resetDisplayModeList();
   int  addDisplayMode(int width, int height, int bpp);
+
+  void setPalette(RGBColor *color);
 
   BOOL isDisplayModeAvailable(int width, int height, int bpp);
   BOOL decreaseDisplayModeResolution( int *width, int *height );
Index: netpanzer/src/DirectX/DDraw/DirectDrawPalette.cpp
diff -u netpanzer/src/DirectX/DDraw/DirectDrawPalette.cpp:1.1 
netpanzer/src/DirectX/DDraw/DirectDrawPalette.cpp:1.2
--- netpanzer/src/DirectX/DDraw/DirectDrawPalette.cpp:1.1       Sun Dec  1 
12:19:35 2002
+++ netpanzer/src/DirectX/DDraw/DirectDrawPalette.cpp   Sun Aug 31 20:03:02 2003
@@ -387,13 +387,13 @@
 
 
 //---------------------------------------------------------------------------
-void DirectDrawPalette::loadLibPalette(const Palette &libPalette, 
LPDIRECTDRAWSURFACE lpAttachSurface)
+void DirectDrawPalette::loadLibPalette(const RGBColor *color, 
LPDIRECTDRAWSURFACE lpAttachSurface)
 {
        for(int i = 0; i < 256; i++)
        {
-               paletteTable[i].peRed   = libPalette.color[i].red;
-               paletteTable[i].peGreen = libPalette.color[i].green; 
-               paletteTable[i].peBlue  = libPalette.color[i].blue;
+               paletteTable[i].peRed   = color[i].red;
+               paletteTable[i].peGreen = color[i].green; 
+               paletteTable[i].peBlue  = color[i].blue;
                paletteTable[i].peFlags = PC_NOCOLLAPSE;
        }
 
Index: netpanzer/src/DirectX/DDraw/DirectDrawPalette.hpp
diff -u netpanzer/src/DirectX/DDraw/DirectDrawPalette.hpp:1.1 
netpanzer/src/DirectX/DDraw/DirectDrawPalette.hpp:1.2
--- netpanzer/src/DirectX/DDraw/DirectDrawPalette.hpp:1.1       Sun Dec  1 
12:19:35 2002
+++ netpanzer/src/DirectX/DDraw/DirectDrawPalette.hpp   Sun Aug 31 20:03:02 2003
@@ -59,7 +59,7 @@
        void cleanUp();
        void initialize( LPDIRECTDRAW lpDirectDraw, int paletteMode );
        void loadACTPalette(const char *filename, LPDIRECTDRAWSURFACE 
lpAttachSurface);
-       void loadLibPalette(const Palette &mattLibPalette, LPDIRECTDRAWSURFACE 
lpAttachSurface);
+       void loadLibPalette(const RGBColor *colors, LPDIRECTDRAWSURFACE 
lpAttachSurface);
        void activateSystemPalette(void);
        void activateCurrentPalette(void);
 };
Index: netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp
diff -u netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp:1.1 
netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp:1.2
--- netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp:1.1       Sun Dec  1 
12:19:35 2002
+++ netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp   Sun Aug 31 20:03:02 2003
@@ -20,8 +20,6 @@
 
 #include "DirectDraw.hpp"
 
-extern DirectDraw DDraw;
-
 extern unsigned long DBUFFER_WIDTH;
 extern unsigned long DBUFFER_HEIGHT;
 extern unsigned long DBUFFER_VIEW_WIDTH;
Index: netpanzer/src/Lib/Stdafx.hpp
diff -u netpanzer/src/Lib/Stdafx.hpp:1.1 netpanzer/src/Lib/Stdafx.hpp:1.2
--- netpanzer/src/Lib/Stdafx.hpp:1.1    Sun Dec  1 12:51:46 2002
+++ netpanzer/src/Lib/Stdafx.hpp        Sun Aug 31 20:03:03 2003
@@ -24,7 +24,7 @@
        #pragma once
 #endif
 
-
+#include <sdl.h>
 #include <assert.h>
 #include <ctype.h>
 #include <conio.h>
Index: netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp
diff -u netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp:1.1 
netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp:1.1       Sun Dec  1 
12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp   Sun Aug 31 20:03:03 2003
@@ -30,7 +30,7 @@
  
 void DDHardSurface::create(int xPix, int yPix, int nStride, int nNumFrames) 
  {
-  DDraw.createFrameBuffer( xPix, yPix, 8 );
+  Screen->createFrameBuffer( xPix, yPix, 8 );
   stride         = nStride;
   pix         = iXY( xPix, yPix ); 
   stride      = nStride;
@@ -43,7 +43,7 @@
  {
   //assert( lock_status == _FALSE );
   
-  DDraw.lockDoubleBuffer( (unsigned char **) &frame0 );
+  Screen->lockDoubleBuffer( (unsigned char **) &frame0 );
   mem = frame0;
   
   doesExist = _TRUE;
@@ -54,7 +54,7 @@
  {
   //assert( lock_status == _TRUE );
   
-  DDraw.unlockDoubleBuffer();
+  Screen->unlockDoubleBuffer();
  
   doesExist = _FALSE;
   lock_status = _FALSE; 
@@ -64,5 +64,5 @@
  {
   assert( lock_status == _FALSE );
   
-  DDraw.copyDoubleBufferandFlip();
+  Screen->copyDoubleBufferandFlip();
  }
Index: netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp
diff -u netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp:1.1 
netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp:1.2
--- netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp:1.1       Sun Dec  1 
12:51:56 2002
+++ netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp   Sun Aug 31 20:03:03 2003
@@ -35,6 +35,8 @@
        //clear out the GlobalApp data--
        memset((void *) &gapp, 0, sizeof(gapp));
 
+       SDL_Init(SDL_INIT_EVERYTHING);
+
        //Initialize the Windows portion of PanzerKrieg (create a window,
        //fill in the contents of our GlobalApp structure, etc.)
        if( WinInit( hInstance, nCmdShow) == FALSE) return FALSE;
Index: netpanzer/src/NetPanzer/Core/netPanzerWinMain.h
diff -u netpanzer/src/NetPanzer/Core/netPanzerWinMain.h:1.1 
netpanzer/src/NetPanzer/Core/netPanzerWinMain.h:1.2
--- netpanzer/src/NetPanzer/Core/netPanzerWinMain.h:1.1 Sun Dec  1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Core/netPanzerWinMain.h     Sun Aug 31 20:03:03 2003
@@ -21,7 +21,7 @@
 #include <windowsx.h>
 #include <mmsystem.h>
 #include <stdio.h>
-#include "DirectDraw.hpp"
+#include "UIDraw.hpp"
 
 //FUNCTIONS/////////////////////////////////////////////////////
 static BOOL WinInit( HANDLE hInstance, int nCmdShow);
Index: netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp
diff -u netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp:1.1 
netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp:1.2
--- netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp:1.1       Sun Dec  1 
12:51:56 2002
+++ netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp   Sun Aug 31 20:03:03 2003
@@ -30,7 +30,7 @@
 #include "WinSockServer.h"
 #include "WinSockClient.h"
 #include "Server.hpp"
-
+#include "UIDraw.hpp"
 #include "PlayerInterface.hpp"
 #include "GameManager.hpp"
 #include "cMouse.hpp"
@@ -91,15 +91,15 @@
         if ( fActive == TRUE )
          {
           LOG( ("WM_ACTIVATEAPP : GDI FALSE") );
-          DDraw.restoreAll();
-          DDraw.setGDIStatus( FALSE ); 
+          Screen->restoreAll();
+          Screen->setGDIStatus( FALSE ); 
           //DDraw.palette.activateCurrentPalette();
          }
         
         if ( fActive == FALSE )
          {
           LOG( ("WM_ACTIVATEAPP : GDI TRUE") );
-          DDraw.setGDIStatus( TRUE ); 
+          Screen->setGDIStatus( TRUE ); 
           //DDraw.palette.activateSystemPalette();
          }
        
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.1 
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.1      Sun Dec  1 
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp  Sun Aug 31 20:03:03 2003
@@ -172,9 +172,9 @@
   if( execution_mode == _execution_mode_loop_back_server)
    { 
     LOG( ( "Initializing Direct Draw" ) );
-    if( ( DDraw.initialize() ) == _FALSE ) 
+    if( ( Screen->initialize() ) == _FALSE ) 
      {
-         MessageBox(gapp.hwndApp, "DDraw.Initialize Failed", "Fatal Error", 
MB_OK);
+         MessageBox(gapp.hwndApp, "Screen->Initialize Failed", "Fatal Error", 
MB_OK);
          return ( _FALSE );
      }
  
@@ -195,7 +195,7 @@
   //ShutdownWinSockServer();
 
   DirectInput::shutdown();
-  DDraw.shutdown();      
+  Screen->shutdown();    
  }
 
 // ******************************************************************
@@ -334,12 +334,12 @@
 // ******************************************************************
 boolean GameManager::setVideoMode( PointXYi mode_res )
  {
-  if ( DDraw.isDisplayModeAvailable( mode_res.x, mode_res.y, 8 ) == _TRUE      
)
+  if ( Screen->isDisplayModeAvailable( mode_res.x, mode_res.y, 8 ) == _TRUE    
)
    {
     previous_video_mode_res = current_video_mode_res;
           current_video_mode_res = mode_res;
 
-       if (!DDraw.setVideoMode(current_video_mode_res.x, 
current_video_mode_res.y, 8, current_mode_flags)) return FALSE;
+       if (!Screen->setVideoMode(current_video_mode_res.x, 
current_video_mode_res.y, 8, current_mode_flags)) return FALSE;
     
        WorldViewInterface::setCameraSize( current_video_mode_res.x, 
current_video_mode_res.y );
     FRAME_BUFFER.create(current_video_mode_res.x, current_video_mode_res.y, 
current_video_mode_res.x, 1 );
@@ -367,7 +367,7 @@
   screen.bltStringCenter(string, color);
   FRAME_BUFFER.unlock();
   screen.unlock();
-  DDraw.copyDoubleBufferandFlip(); 
+  Screen->copyDoubleBufferandFlip(); 
  }
 
 // ******************************************************************
@@ -442,7 +442,8 @@
        
        Palette pal;
 
-       DDraw.palette.loadLibPalette(pal, DDraw.lpFrontBuffer);
+//     Screen->palette.loadLibPalette(pal, Screen->lpFrontBuffer);
+       Screen->setPalette(pal.color);
  }
 
 // ******************************************************************
@@ -454,7 +455,8 @@
 
        Palette pal;
 
-       DDraw.palette.loadLibPalette(pal, DDraw.lpFrontBuffer);
+//     Screen->palette.loadLibPalette(pal, Screen->lpFrontBuffer);
+       Screen->setPalette(pal.color);
        ConsoleInterface::postMessage( "Increasing Brightness");
 
 } // end increaseBrightness
@@ -468,7 +470,8 @@
 
        Palette pal;
 
-       DDraw.palette.loadLibPalette(pal, DDraw.lpFrontBuffer);
+//     Screen->palette.loadLibPalette(pal, Screen->lpFrontBuffer);
+       Screen->setPalette(pal.color);
        ConsoleInterface::postMessage( "Decreasing Brightness");
 
 } // end increaseBrightness
@@ -1644,7 +1647,7 @@
        FRAME_BUFFER.unlock();
        screen.unlock();
 
-       DDraw.copyDoubleBufferandFlip(); 
+       Screen->copyDoubleBufferandFlip(); 
        }
 }
 
@@ -1660,7 +1663,7 @@
 
     //winsock hack
     //fix dialup problem--
-       //DDraw.setGDIStatus(true);
+       //Screen->setGDIStatus(true);
        //minimize = MinimizeOrNot( gapp.hwndApp );    
        
     /*
@@ -1669,13 +1672,13 @@
 
        if (minimize == _FALSE)
         { 
-      DDraw.setGDIStatus(false);
+      Screen->setGDIStatus(false);
         }  
     else
      {
       OpenIcon( gapp.hwndApp ); 
-      DDraw.restoreAll();
-      DDraw.setGDIStatus( FALSE ); 
+      Screen->restoreAll();
+      Screen->setGDIStatus( FALSE ); 
      }
        */
     
@@ -2107,7 +2110,7 @@
   FRAME_BUFFER.unlock();
   screen.unlock();
 
-  DDraw.copyDoubleBufferandFlip(); 
+  Screen->copyDoubleBufferandFlip(); 
 
  }
 
Index: netpanzer/src/NetPanzer/Interfaces/NetworkClientDPlay.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/NetworkClientDPlay.cpp:1.1 
netpanzer/src/NetPanzer/Interfaces/NetworkClientDPlay.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/NetworkClientDPlay.cpp:1.1       Sun Dec 
 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/NetworkClientDPlay.cpp   Sun Aug 31 
20:03:03 2003
@@ -83,14 +83,14 @@
   HRESULT hr;
   BOOL minimize;
 
-  DDraw.setGDIStatus(true);
+  Screen->setGDIStatus(true);
   
   minimize = MinimizeOrNot(gapp.hwndApp);
   hr = EnumerateGames( gapp.hwndApp );
 
   if (minimize == _FALSE)
    {
-       DDraw.setGDIStatus(false);
+       Screen->setGDIStatus(false);
    }
 
   if( (hr == DPERR_USERCANCEL) || (hr == DPERR_EXCEPTION) || (hr == 
DPERR_GENERIC) )
Index: netpanzer/src/NetPanzer/Interfaces/NetworkServerDPlay.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/NetworkServerDPlay.cpp:1.1 
netpanzer/src/NetPanzer/Interfaces/NetworkServerDPlay.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/NetworkServerDPlay.cpp:1.1       Sun Dec 
 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/NetworkServerDPlay.cpp   Sun Aug 31 
20:03:03 2003
@@ -66,7 +66,7 @@
   HRESULT hr;
   BOOL minimize;
 
-  DDraw.setGDIStatus(true);
+  Screen->setGDIStatus(true);
   minimize = MinimizeOrNot( gapp.hwndApp );    
 
   //SetServProv( gapp.hwndApp, TCPIP );
@@ -75,13 +75,13 @@
   
   if (minimize == _FALSE)
    { 
-    DDraw.setGDIStatus(false);
+    Screen->setGDIStatus(false);
    }  
   else
    {
     OpenIcon( gapp.hwndApp ); 
-    DDraw.restoreAll();
-    DDraw.setGDIStatus( FALSE ); 
+    Screen->restoreAll();
+    Screen->setGDIStatus( FALSE ); 
    }
 
   MouseInterface::hideHardwareCursor();   
Index: netpanzer/src/NetPanzer/Resources/netPanzer.aps
Index: netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.1 
netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.1        Sun Dec  1 
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp    Sun Aug 31 20:03:03 2003
@@ -20,7 +20,7 @@
 #include "stdafx.hpp"
 #include "LobbyView.hpp"
 #include "Desktop.hpp"
-#include "DirectDraw.hpp"
+#include "UIDraw.hpp"
 #include "DirectDrawGlobals.hpp"
 #include "DDHardSurface.hpp"
 #include "GameManager.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.1 
netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.1     Sun Dec  1 
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp Sun Aug 31 20:03:03 2003
@@ -20,7 +20,7 @@
 #include "stdafx.hpp"
 #include "ProgressView.hpp"
 #include "Desktop.hpp"
-#include "DirectDraw.hpp"
+#include "UIDraw.hpp"
 #include "DirectDrawGlobals.hpp"
 #include "DDHardSurface.hpp"
 #include "GameManager.hpp"
@@ -115,7 +115,7 @@
   
     FRAME_BUFFER.unlock();
     screen.unlock();
-    DDraw.copyDoubleBufferandFlip(); 
+    Screen->copyDoubleBufferandFlip(); 
  }
 
 // scroll
@@ -156,7 +156,7 @@
   
     FRAME_BUFFER.unlock();
     screen.unlock();
-    DDraw.copyDoubleBufferandFlip(); 
+    Screen->copyDoubleBufferandFlip(); 
 
 } // end ProgressView::scrollDirect
 
@@ -189,7 +189,7 @@
   
     FRAME_BUFFER.unlock();
     screen.unlock();
-    DDraw.copyDoubleBufferandFlip(); 
+    Screen->copyDoubleBufferandFlip(); 
 
  } // end ProgressView::scrollDirect
 
Index: netpanzer/src/Workspace/netPanzerBuildTree/netPanzer/netPanzer.dsp
diff -u netpanzer/src/Workspace/netPanzerBuildTree/netPanzer/netPanzer.dsp:1.1 
netpanzer/src/Workspace/netPanzerBuildTree/netPanzer/netPanzer.dsp:1.2
--- netpanzer/src/Workspace/netPanzerBuildTree/netPanzer/netPanzer.dsp:1.1      
Sun Dec  1 12:52:09 2002
+++ netpanzer/src/Workspace/netPanzerBuildTree/netPanzer/netPanzer.dsp  Sun Aug 
31 20:03:03 2003
@@ -70,7 +70,7 @@
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /G5 /MTd /W3 /GX /Zi /Od /Ob1 /I "..\..\..\directX\ddraw" /I 
"..\..\..\directX\directInput" /I "..\..\..\directX\directPlay" /I 
"..\..\..\directX\directSound" /I "..\..\..\Win32" /I "..\..\..\Lib" /I 
"..\..\..\Lib\interfaces" /I "..\..\..\netPanzer\structs" /I 
"..\..\..\netPanzer\views" /I "..\..\..\netPanzer\port" /I 
"..\..\..\netPanzer\Interfaces" /I "..\..\..\netPanzer\Classes" /I 
"..\..\..\netPanzer\Classes\AI" /I "..\..\..\netPanzer\Classes\Network" /I 
"..\..\..\netPanzer\Core" /I "..\..\..\Lib\2D" /I "..\..\..\Lib\Interfaces" /I 
"..\..\..\Lib\Types" /I "..\..\..\Lib\View" /I "..\..\..\Lib\Particles" /I 
"..\..\..\netPanzer\Classes\weapons" /I "..\..\..\netPanzer\views\mainmenu" /I 
"..\..\..\netPanzer\views\mainmenu\options" /I 
"..\..\..\netPanzer\views\mainmenu\multi" /I "..\..\..\netPanzer\views\game" /I 
"..\..\..\netPanzer\classes\units" /I "..\..\..\Lib\PObject\Classes" /I 
"..\..\..\Lib\PObject\Templates" /I "..\..\..\netPanzer\resources" /I 
"..\..\..\Win32\WinSock" /I "..\..\..\Lua\Include" /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /D "_LOGGING_ON" /YX"stdafx.hpp" /FD /c

+# ADD CPP /nologo /G5 /MTd /W3 /GX /Zi /Od /Ob1 /I "..\..\..\UILib" /I 
"..\..\..\UILib\SDL" /I "..\..\..\directX\ddraw" /I 
"..\..\..\directX\directInput" /I "..\..\..\directX\directPlay" /I 
"..\..\..\directX\directSound" /I "..\..\..\Win32" /I "..\..\..\Lib" /I 
"..\..\..\Lib\interfaces" /I "..\..\..\netPanzer\structs" /I 
"..\..\..\netPanzer\views" /I "..\..\..\netPanzer\port" /I 
"..\..\..\netPanzer\Interfaces" /I "..\..\..\netPanzer\Classes" /I 
"..\..\..\netPanzer\Classes\AI" /I "..\..\..\netPanzer\Classes\Network" /I 
"..\..\..\netPanzer\Core" /I "..\..\..\Lib\2D" /I "..\..\..\Lib\Interfaces" /I 
"..\..\..\Lib\Types" /I "..\..\..\Lib\View" /I "..\..\..\Lib\Particles" /I 
"..\..\..\netPanzer\Classes\weapons" /I "..\..\..\netPanzer\views\mainmenu" /I 
"..\..\..\netPanzer\views\mainmenu\options" /I 
"..\..\..\netPanzer\views\mainmenu\multi" /I "..\..\..\netPanzer\views\game" /I 
"..\..\..\netPanzer\classes\units" /I "..\..\..\Lib\PObject\Classes" /I 
"..\..\..\Lib\PObject\Templates" /I "..\..\..\netPanzer\resources" /I 
"..\..\..\Win32\WinSock" /I "..\..\..\Lua\Include" /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /D "_LOGGING_ON" /FR /YX"stdafx.hpp" /FD /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -80,7 +80,7 @@
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib 
odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 dplayx.lib dsound.lib dinput.lib dxguid.lib kernel32.lib 
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib 
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ddraw.lib 
wsock32.lib /nologo /subsystem:windows /debug /machine:I386 
/out:".\Debug\netPanzerD.exe"

+# ADD LINK32 dplayx.lib dsound.lib dinput.lib dxguid.lib odbc32.lib 
odbccp32.lib winmm.lib ddraw.lib wsock32.lib SDL.lib kernel32.lib user32.lib 
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib 
oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 
/out:".\Debug\netPanzerD.exe"

 # SUBTRACT LINK32 /profile /pdb:none /incremental:no

 

 !ENDIF 

@@ -2371,6 +2371,26 @@
 # Begin Source File

 

 SOURCE=..\..\..\Lib\terminate.cpp

+# End Source File

+# End Group

+# Begin Group "UILib"

+

+# PROP Default_Filter ""

+# Begin Group "SDL"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\..\..\UILib\SDL\SDLDraw.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\UILib\SDL\SDLDraw.hpp

+# End Source File

+# End Group

+# Begin Source File

+

+SOURCE=..\..\..\UILib\UIDraw.hpp

 # End Source File

 # End Group

 # End Target

Index: 
netpanzer/src/Workspace/netPanzerBuildTree/netPanzerSetup/netPanzerSetup.dsp
diff -u 
netpanzer/src/Workspace/netPanzerBuildTree/netPanzerSetup/netPanzerSetup.dsp:1.1
 
netpanzer/src/Workspace/netPanzerBuildTree/netPanzerSetup/netPanzerSetup.dsp:1.2
--- 
netpanzer/src/Workspace/netPanzerBuildTree/netPanzerSetup/netPanzerSetup.dsp:1.1
    Sun Dec  1 12:52:09 2002
+++ 
netpanzer/src/Workspace/netPanzerBuildTree/netPanzerSetup/netPanzerSetup.dsp    
    Sun Aug 31 20:03:03 2003
@@ -79,7 +79,7 @@
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo 
/subsystem:windows /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 dsetup.lib kernel32.lib user32.lib gdi32.lib winspool.lib 
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo 
/subsystem:windows /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 dsetup.lib SDL.lib kernel32.lib user32.lib gdi32.lib winspool.lib 
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo 
/subsystem:windows /debug /machine:I386 /pdbtype:sept

 

 !ENDIF