[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_draw.cpp,1.26,1.27 d_draw.h,1.7,1.8

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sat Sep 27 11:20:09 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv18170/driver

Modified Files:
	d_draw.cpp d_draw.h 
Log Message:
cleanup


Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_draw.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- d_draw.cpp	23 Sep 2003 16:38:37 -0000	1.26
+++ d_draw.cpp	27 Sep 2003 17:41:02 -0000	1.27
@@ -37,20 +37,12 @@
 int16 screenDeep;
 int16 screenWide;
 
-
-// Set to 1 if vertical blank status cannot be checked.
-// BOOL			bFullScreen = 0;
-
-
-
 // Scroll variables.  scrollx and scrolly hold the current scroll position, 
 
-int16			scrollx;
-int16			scrolly;
+int16 scrollx;
+int16 scrolly;
 
-int32			renderCaps = 0;
-int32			dxHalCaps = 0;
-int32			dxHelCaps = 0;
+int32 renderCaps = 0;
 
 void FatalDirectDrawError(char *str, int32 code, char *filename, int32 line) {
 	char string[256];

Index: d_draw.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_draw.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- d_draw.h	23 Sep 2003 16:53:25 -0000	1.7
+++ d_draw.h	27 Sep 2003 17:41:02 -0000	1.8
@@ -17,20 +17,6 @@
  * $Header$
  */
 
-//=============================================================================
-//
-//	Filename	:	d_draw.h
-//	Created		:	22nd August 1996
-//	By			:	P.R.Porter
-//
-//	Summary		:	This include file defines links to all data which is
-//					defined in the d_draw.c module, but can be accessed by
-//					other parts of the driver96 library.
-//
-//
-//=============================================================================
-
-
 #ifndef D_DRAW_H
 #define D_DRAW_H
 
@@ -40,18 +26,7 @@
 
 #include "driver96.h"
 
-//  Bits defining hardware and emulation capabilities.
-#define RDCAPS_BLTSTRETCH	1
-#define RDCAPS_SRCBLTCKEY	2
-#define DirectDrawError(f, g) FatalDirectDrawError(f, g, __FILE__, __LINE__)
-
-
-extern uint8 *lpPalette;			// palette
-extern byte *lpBackBuffer;		// back surface
-extern int32					dxHalCaps;			// Hardware capabilities.
-extern int32					dxHelCaps;			// Emulation capabilities.
-
-extern void FatalDirectDrawError(char *str, int32 dderr, char *file, int32 line);
+extern byte *lpBackBuffer;
 
 #ifdef __cplusplus
 }





More information about the Scummvm-git-logs mailing list