[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_draw.cpp,1.28,1.29

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sun Sep 28 09:39:03 CEST 2003


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

Modified Files:
	d_draw.cpp 
Log Message:
cleanup


Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_draw.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- d_draw.cpp	28 Sep 2003 14:13:57 -0000	1.28
+++ d_draw.cpp	28 Sep 2003 16:38:00 -0000	1.29
@@ -21,12 +21,10 @@
 #include "stdafx.h"
 #include "driver96.h"
 #include "bs2/header.h"		// HACK: For cutscenes instruction message
-#include "bs2/memory.h"		// HACK: For cutscenes instruction message
 #include "bs2/maketext.h"	// HACK: For cutscenes instruction message
 #include "bs2/sword2.h"
 #include "sound/mixer.h"
 #include "rdwin.h"
-#include "_mouse.h"
 #include "d_draw.h"
 #include "palette.h"
 #include "render.h"
@@ -44,13 +42,6 @@
 
 int32 renderCaps = 0;
 
-void FatalDirectDrawError(char *str, int32 code, char *filename, int32 line) {
-	char string[256];
-
-	sprintf(string, "FATAL: %s - code 0x%.8x - file %s - line %d", str, code, filename, line);
-	warning("%s", string);
-}
-
 int32 PlotDots(int16 x, int16 y, int16 count) {
 
 	warning("stub PlotDots( %d, %d, %d )", x, y, count);
@@ -88,8 +79,8 @@
 		IDirectDrawSurface2_Unlock(lpBackBuffer, ddDescription.lpSurface);
 	}
 */
-	return(RD_OK);
 
+	return RD_OK;
 }
 
 /**
@@ -167,7 +158,8 @@
 }
 
 /**
- * Fill the screen buffer with palette colour zero.
+ * Fill the screen buffer with palette colour zero. Note that it does not
+ * touch the menu areas of the screen.
  */
 
 int32 EraseBackBuffer( void ) {
@@ -182,7 +174,7 @@
 }
 
 
-uint8 *textSurface = NULL;
+static uint8 *textSurface = NULL;
 
 void OpenTextObject(_movieTextObject *obj) {
 	if (obj->textSprite)





More information about the Scummvm-git-logs mailing list