[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src Makefile DirectX/DDraw/DirectDraw...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer/src Makefile DirectX/DDraw/DirectDraw... |
|
Date: |
Sat, 06 Sep 2003 07:04:16 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/09/06 07:04:15
Modified files:
src : Makefile
src/DirectX/DDraw: DirectDraw.cpp DirectDrawglobals.hpp
src/NetPanzer/Classes: DDHardSurface.cpp TileEngine.cpp
WorldInputCmdProcessor.cpp
src/NetPanzer/Core: netPanzerWinMain.cpp
src/NetPanzer/Port: Wrldsprt.cpp blitters.cpp
src/NetPanzer/Views/Game: AreYouSureResignView.cpp
GameTemplateView.hpp LobbyView.cpp
ProgressView.cpp WinnerMesgView.cpp
src/NetPanzer/Views/MainMenu: MainMenuView.cpp
MenuTemplateView.cpp
OptionsTemplateView.cpp
OrderingView.cpp SkirmishView.cpp
src/NetPanzer/Views/MainMenu/Multi: GetSessionView.cpp
HostJoinTemplateView.cpp
src/NetPanzer/Views/MainMenu/Options: ControlsView.cpp
src/Stub : DirectPlay.h
src/UILib : UIDraw.cpp UIDraw.hpp
src/UILib/SDL : SDLDraw.cpp SDLDraw.hpp
Removed files:
src/Stub : DirectDrawGlobals.hpp GameTemplateView.hpp
sfx.h
Log message:
-Added some global vars from DirectDrawglobals.hpp to UIDraw.hpp and
added stubs
for them in SDLDraw.cpp
-added some more small stub functions
=> the app compiles and links in linux now.
Patches:
Index: netpanzer/src/DirectX/DDraw/DirectDraw.cpp
diff -u netpanzer/src/DirectX/DDraw/DirectDraw.cpp:1.4
netpanzer/src/DirectX/DDraw/DirectDraw.cpp:1.5
--- netpanzer/src/DirectX/DDraw/DirectDraw.cpp:1.4 Fri Sep 5 22:01:17 2003
+++ netpanzer/src/DirectX/DDraw/DirectDraw.cpp Sat Sep 6 07:04:14 2003
@@ -44,8 +44,6 @@
//extern globalApp gapp;
-DirectDraw DDraw;
-
unsigned char *DOUBLE_BUFFER = 0;
unsigned long DBUFFER_WIDTH;
Index: netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp
diff -u netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp:1.3
netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp:1.4
--- netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp:1.3 Mon Sep 1
16:24:18 2003
+++ netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp Sat Sep 6 07:04:14 2003
@@ -20,6 +20,7 @@
#include "DirectDraw.hpp"
+#if 0
extern DirectDraw DDraw;
extern unsigned long DBUFFER_WIDTH;
@@ -29,5 +30,6 @@
extern unsigned long X_CLIP_OFS;
extern unsigned long Y_CLIP_OFS;
extern unsigned long OFFSET_TO_VIEW;
+#endif
#endif // end __DirectDrawglobals_hpp__
Index: netpanzer/src/Makefile
diff -u netpanzer/src/Makefile:1.5 netpanzer/src/Makefile:1.6
--- netpanzer/src/Makefile:1.5 Fri Sep 5 22:01:17 2003
+++ netpanzer/src/Makefile Sat Sep 6 07:04:14 2003
@@ -14,7 +14,8 @@
UILib
ifeq ($(SYSTEM),UNIX)
-DIRS += NetPanzer/Interfaces/unix Stub Win32/unix
+DIRS += NetPanzer/Interfaces/unix Stub Win32/unix UILib/SDL \
+ NetPanzer/Core/unix
GOAL = ../netpanzer
LINKFLAGS += -g3 `sdl-config --libs` -lSDL_net
CFLAGS += `sdl-config --cflags` -DUNIX
Index: netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp
diff -u netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp:1.4
netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp:1.4 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp Sat Sep 6 07:04:14 2003
@@ -18,7 +18,6 @@
#include <config.h>
#include "UIDraw.hpp"
#include "DDHardSurface.hpp"
-#include "DirectDrawGlobals.hpp"
DDHardSurface FRAME_BUFFER;
Index: netpanzer/src/NetPanzer/Classes/TileEngine.cpp
diff -u netpanzer/src/NetPanzer/Classes/TileEngine.cpp:1.3
netpanzer/src/NetPanzer/Classes/TileEngine.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/TileEngine.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/TileEngine.cpp Sat Sep 6 07:04:14 2003
@@ -17,7 +17,6 @@
*/
#include <config.h>
#include "TileEngine.hpp"
-#include "DirectDrawGlobals.hpp"
#include "blitters.h"
#include "DDHardSurface.hpp"
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.6
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.6 Sat Sep
6 06:34:28 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp Sat Sep 6
07:04:14 2003
@@ -51,11 +51,6 @@
#include "netPanzerGlobals.h"
#include "JoystickInterface.hpp"
-
-// ** NOTE: TEMPORARY FOR CRAPPY DRAWING FUNCTIONS
-#include "DirectDrawGlobals.hpp"
-
-
WorldInputCmdProcessor COMMAND_PROCESSOR;
Index: netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp
diff -u netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp:1.4
netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp:1.5
--- netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp:1.4 Wed Sep 3
15:48:01 2003
+++ netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp Sat Sep 6 07:04:15 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
// XXX need new unix code here
-#ifndef UNIX
+#ifdef WIN32
#include <config.h>
#include <stdlib.h>
#include <windows.h>
@@ -38,10 +38,6 @@
//clear out the GlobalApp data--
memset((void *) &gapp, 0, sizeof(gapp));
-
-#ifdef USE_SDL
- SDL_Init(SDL_INIT_EVERYTHING);
-#endif
//Initialize the Windows portion of PanzerKrieg (create a window,
//fill in the contents of our GlobalApp structure, etc.)
Index: netpanzer/src/NetPanzer/Port/Wrldsprt.cpp
diff -u netpanzer/src/NetPanzer/Port/Wrldsprt.cpp:1.4
netpanzer/src/NetPanzer/Port/Wrldsprt.cpp:1.5
--- netpanzer/src/NetPanzer/Port/Wrldsprt.cpp:1.4 Sat Sep 6 06:34:29 2003
+++ netpanzer/src/NetPanzer/Port/Wrldsprt.cpp Sat Sep 6 07:04:15 2003
@@ -17,7 +17,6 @@
*/
#include <config.h>
#include "Globals.h"
-#include "DirectDrawGlobals.hpp"
#include "Wrldsprt.hpp"
#include "blitters.h"
#include "UIDraw.hpp"
Index: netpanzer/src/NetPanzer/Port/blitters.cpp
diff -u netpanzer/src/NetPanzer/Port/blitters.cpp:1.3
netpanzer/src/NetPanzer/Port/blitters.cpp:1.4
--- netpanzer/src/NetPanzer/Port/blitters.cpp:1.3 Fri Sep 5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Port/blitters.cpp Sat Sep 6 07:04:15 2003
@@ -16,8 +16,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
+#include <assert.h>
#include "blitters.h"
-#include "DirectDrawGlobals.hpp"
+#include "codewiz.hpp"
void blit_partial_xy( unsigned char *tile_ptr,unsigned char *buffer_ptr,short
y_size,short x_size)
{
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.4
netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.4 Sat Sep
6 06:34:29 2003
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp Sat Sep 6
07:04:15 2003
@@ -20,7 +20,6 @@
#include <config.h>
#include "AreYouSureResignView.hpp"
#include "Desktop.hpp"
-#include "DirectDrawGlobals.hpp"
#include "DDHardSurface.hpp"
#include "GameManager.hpp"
#include "ParticleSystem2D.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/GameTemplateView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameTemplateView.hpp:1.1
netpanzer/src/NetPanzer/Views/Game/GameTemplateView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/GameTemplateView.hpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/GameTemplateView.hpp Sat Sep 6
07:04:15 2003
@@ -19,15 +19,8 @@
#ifndef __GameTemplateView_hpp__
#define __GameTemplateView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
-
//---------------------------------------------------------------------------
class GameTemplateView : public View
Index: netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.4
netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.4 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp Sat Sep 6 07:04:15 2003
@@ -21,7 +21,6 @@
#include "LobbyView.hpp"
#include "Desktop.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.4
netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.4 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp Sat Sep 6 07:04:15 2003
@@ -19,7 +19,6 @@
#include "ProgressView.hpp"
#include "Desktop.hpp"
#include "UIDraw.hpp"
-#include "DirectDrawGlobals.hpp"
#include "DDHardSurface.hpp"
#include "GameManager.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.4
netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.4 Sat Sep 6
06:34:29 2003
+++ netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp Sat Sep 6
07:04:15 2003
@@ -22,7 +22,6 @@
#include "Stats.hpp"
#include "Sound.hpp"
#include "DDHardSurface.hpp"
-#include "DirectDrawGlobals.hpp"
#include "ParticleSystem2D.hpp"
#include "Particle2D.hpp"
#include "GameManager.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp Sat Sep 6
07:04:15 2003
@@ -21,7 +21,6 @@
#include "MainMenuView.hpp"
#include "Desktop.hpp"
#include "DDHardSurface.hpp"
-#include "DirectDrawGlobals.hpp"
#include "FontSystem2D.hpp"
#include "GameManager.hpp"
#include "GameViewGlobals.hpp"
@@ -29,14 +28,6 @@
#include "HostJoinTemplateView.hpp"
#include "GetSessionView.hpp"
#include "GameConfig.hpp"
-
-static void bQuickLaunch()
-{
- GameConfig::SetGameMode(_gamemode_multiplayer);
-
- bNext();
- bReady();
-}
// MainMenuView
//---------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.4 Sat Sep
6 06:34:29 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp Sat Sep 6
07:04:15 2003
@@ -25,7 +25,6 @@
#include "Sound.hpp"
#include "cMouse.hpp"
#include "ViewGlobals.hpp"
-#include "DirectDrawGlobals.hpp"
#include "DDHardSurface.hpp"
#include "FontSystem2D.hpp"
#include "RadarPingParticle2D.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.4 Sat Sep
6 06:34:29 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp Sat Sep
6 07:04:15 2003
@@ -24,7 +24,6 @@
#include "GameConfig.hpp"
#include "GameManager.hpp"
#include "DirectPlay.h"
-#include "DirectDrawGlobals.hpp"
#include "gapp.hpp"
#include "MouseInterface.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.4
Sat Sep 6 06:34:29 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
Sat Sep 6 07:04:15 2003
@@ -24,7 +24,6 @@
#include "GameManager.hpp"
#include "DirectPlay.h"
#include "gapp.hpp"
-#include "DirectDrawGlobals.hpp"
#include "DDHardSurface.hpp"
#include "FontSystem2D.hpp"
#include "HostView.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.3 Fri Sep
5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp Sat Sep
6 07:04:15 2003
@@ -21,7 +21,6 @@
#include "ControlsView.hpp"
#include "Desktop.hpp"
#include "DDHardSurface.hpp"
-#include "DirectDrawGlobals.hpp"
#include "JoystickInterface.hpp"
#include "GameConfig.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.3 Fri Sep
5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp Sat Sep
6 07:04:15 2003
@@ -21,7 +21,6 @@
#include "OptionsTemplateView.hpp"
#include "Desktop.hpp"
#include "DDHardSurface.hpp"
-#include "DirectDrawGlobals.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp:1.3 Fri Sep 5
22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp Sat Sep 6
07:04:15 2003
@@ -21,7 +21,6 @@
#include "OrderingView.hpp"
#include "Desktop.hpp"
#include "DDHardSurface.hpp"
-#include "DirectDrawGlobals.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp:1.3 Fri Sep 5
22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp Sat Sep 6
07:04:15 2003
@@ -21,7 +21,6 @@
#include "SkirmishView.hpp"
#include "Desktop.hpp"
#include "DDHardSurface.hpp"
-#include "DirectDrawGlobals.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/Stub/DirectPlay.h
diff -u netpanzer/src/Stub/DirectPlay.h:1.2 netpanzer/src/Stub/DirectPlay.h:1.3
--- netpanzer/src/Stub/DirectPlay.h:1.2 Fri Sep 5 19:01:48 2003
+++ netpanzer/src/Stub/DirectPlay.h Sat Sep 6 07:04:15 2003
@@ -1,10 +1,15 @@
#ifndef __DIRECTPLAY_H__
#define __DIRECTPLAY_H__
+#include <stdio.h>
+
// very dummy stub for directplay stuff
typedef int DPID;
-void SetPacketFunction( void ( * packet_func)( void *message, unsigned long
message_size, DPID toID, DPID fromID) );
+static inline void SetPacketFunction( void ( * packet_func)( void *message,
unsigned long message_size, DPID toID, DPID fromID) )
+{
+ printf ("SetPacketFunction NOT IMPLEMENTED!\n");
+}
#endif
Index: netpanzer/src/UILib/SDL/SDLDraw.cpp
diff -u netpanzer/src/UILib/SDL/SDLDraw.cpp:1.3
netpanzer/src/UILib/SDL/SDLDraw.cpp:1.4
--- netpanzer/src/UILib/SDL/SDLDraw.cpp:1.3 Fri Sep 5 22:01:20 2003
+++ netpanzer/src/UILib/SDL/SDLDraw.cpp Sat Sep 6 07:04:15 2003
@@ -18,6 +18,24 @@
#include <config.h>
#include "SDLDraw.hpp"
+// XXX fixme, need sensefull values here
+unsigned long DBUFFER_WIDTH;
+unsigned long DBUFFER_HEIGHT;
+unsigned long DBUFFER_VIEW_WIDTH;
+unsigned long DBUFFER_VIEW_HEIGHT;
+unsigned long X_CLIP_OFS;
+unsigned long Y_CLIP_OFS;
+unsigned long OFFSET_TO_VIEW;
+
+SDLDraw::SDLDraw()
+ : FrontBuffer(0)
+{
+}
+
+SDLDraw::~SDLDraw()
+{
+}
+
bool SDLDraw::initialize()
{
return true;
@@ -31,37 +49,37 @@
{
FrontBuffer = SDL_SetVideoMode(width, height, bpp, SDL_FULLSCREEN /*|
SDL_DOUBLEBUF | SDL_HWSURFACE*/);
if(FrontBuffer==NULL)
- return FALSE;
- return TRUE;
+ return false;
+ return true;
}
bool SDLDraw::isDisplayModeAvailable(int width, int height, int bpp)
{
if(SDL_VideoModeOK(width, height, bpp, 0 /*SDL_FULLSCREEN |
SDL_DOUBLEBUF | SDL_HWSURFACE*/))
- return TRUE;
+ return true;
- return FALSE;
+ return false;
}
bool SDLDraw::lockDoubleBuffer(BYTE **DoubleBuffer)
{
if(SDL_LockSurface(FrontBuffer)<0)
- return FALSE;
+ return false;
*DoubleBuffer = (unsigned char *)FrontBuffer->pixels;
- return TRUE;
+ return true;
}
bool SDLDraw::unlockDoubleBuffer()
{
SDL_LockSurface(FrontBuffer);
- return TRUE;
+ return true;
}
bool SDLDraw::createFrameBuffer(DWORD width, DWORD height, DWORD bpp)
{
- return TRUE;
+ return true;
}
void SDLDraw::setGDIStatus(bool enable)
@@ -75,8 +93,8 @@
bool SDLDraw::copyDoubleBufferandFlip()
{
if(SDL_Flip(FrontBuffer)==0)
- return TRUE;
- return FALSE;
+ return true;
+ return false;
}
void SDLDraw::setPalette(RGBColor *color)
Index: netpanzer/src/UILib/SDL/SDLDraw.hpp
diff -u netpanzer/src/UILib/SDL/SDLDraw.hpp:1.2
netpanzer/src/UILib/SDL/SDLDraw.hpp:1.3
--- netpanzer/src/UILib/SDL/SDLDraw.hpp:1.2 Mon Sep 1 16:24:22 2003
+++ netpanzer/src/UILib/SDL/SDLDraw.hpp Sat Sep 6 07:04:15 2003
@@ -15,10 +15,11 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#ifndef __SDLDraw_hpp__
#define __SDLDraw_hpp__
+#include <SDL.h>
+
#include "RGBColor.hpp"
#include "UIDraw.hpp"
@@ -27,23 +28,23 @@
class SDLDraw: public UIDraw
{
private:
-
- SDL_Surface *FrontBuffer;
+ SDL_Surface *FrontBuffer;
public:
- bool initialize();
- void shutdown();
- bool setVideoMode(DWORD width, DWORD height, DWORD bpp, BYTE mode_flags);
- bool isDisplayModeAvailable(int width, int height, int bpp);
- bool lockDoubleBuffer(BYTE **DoubleBuffer);
- bool unlockDoubleBuffer();
- bool createFrameBuffer(DWORD width, DWORD height, DWORD bpp);
- void setGDIStatus(bool enable);
- void restoreAll();
- bool copyDoubleBufferandFlip();
- void setPalette(RGBColor *color);
+ SDLDraw();
+ virtual ~SDLDraw();
+
+ bool initialize();
+ void shutdown();
+ bool setVideoMode(DWORD width, DWORD height, DWORD bpp, BYTE
mode_flags);
+ bool isDisplayModeAvailable(int width, int height, int bpp);
+ bool lockDoubleBuffer(BYTE **DoubleBuffer);
+ bool unlockDoubleBuffer();
+ bool createFrameBuffer(DWORD width, DWORD height, DWORD bpp);
+ void setGDIStatus(bool enable);
+ void restoreAll();
+ bool copyDoubleBufferandFlip();
+ void setPalette(RGBColor *color);
}; // end DirectDraw
-
-extern UIDraw *Screen;
#endif // end __UIDraw_hpp__
Index: netpanzer/src/UILib/UIDraw.cpp
diff -u netpanzer/src/UILib/UIDraw.cpp:1.3 netpanzer/src/UILib/UIDraw.cpp:1.4
--- netpanzer/src/UILib/UIDraw.cpp:1.3 Fri Sep 5 22:01:20 2003
+++ netpanzer/src/UILib/UIDraw.cpp Sat Sep 6 07:04:15 2003
@@ -16,14 +16,19 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
-#include "DirectDraw.hpp"
-#include "DirectDrawGlobals.hpp"
#include "UIDraw.hpp"
-//#include "SDL/SDLDraw.hpp"
-//UIDraw *Screen = new SDLDraw();
-//UIDraw *Screen = new DirectDraw();
-// XXX temporary hack because not everything was converted to use Screen
-UIDraw* Screen = &DDraw;
+#ifdef USE_SDL
+#include "SDL/SDLDraw.hpp"
+
+UIDraw *Screen = new SDLDraw();
+#endif
+
+#ifdef WIN32
+#include "DirectDraw.hpp"
+#include "DirectDrawGlobals.hpp"
+
+UIDraw *Screen = new DirectDraw();
+#endif
Index: netpanzer/src/UILib/UIDraw.hpp
diff -u netpanzer/src/UILib/UIDraw.hpp:1.3 netpanzer/src/UILib/UIDraw.hpp:1.4
--- netpanzer/src/UILib/UIDraw.hpp:1.3 Fri Sep 5 19:01:48 2003
+++ netpanzer/src/UILib/UIDraw.hpp Sat Sep 6 07:04:15 2003
@@ -45,6 +45,16 @@
virtual void setPalette(RGBColor *color)=0;
}; // end DirectDraw
+// XXX some global vars, these should be avoided or at least moved inside the
+// UIDraw class!!!
+extern unsigned long DBUFFER_WIDTH;
+extern unsigned long DBUFFER_HEIGHT;
+extern unsigned long DBUFFER_VIEW_WIDTH;
+extern unsigned long DBUFFER_VIEW_HEIGHT;
+extern unsigned long X_CLIP_OFS;
+extern unsigned long Y_CLIP_OFS;
+extern unsigned long OFFSET_TO_VIEW;
+
extern UIDraw *Screen;
#endif // end __UIDraw_hpp__