[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.h,1.76,1.77 gfx.cpp,2.321,2.322

Max Horn fingolfin at users.sourceforge.net
Fri Sep 24 14:39:04 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4950

Modified Files:
	gfx.h gfx.cpp 
Log Message:
Get rid of unused dbClear flag

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- gfx.h	24 Sep 2004 21:35:36 -0000	1.76
+++ gfx.h	24 Sep 2004 21:38:22 -0000	1.77
@@ -295,8 +295,7 @@
 
 	enum DrawBitmapFlags {
 		dbAllowMaskOr = 1,
-		dbDrawMaskOnAll = 2,
-		dbClear = 4
+		dbDrawMaskOnAll = 2
 	};
 };
 

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.321
retrieving revision 2.322
diff -u -d -r2.321 -r2.322
--- gfx.cpp	24 Sep 2004 21:35:37 -0000	2.321
+++ gfx.cpp	24 Sep 2004 21:38:22 -0000	2.322
@@ -1246,10 +1246,10 @@
 
 		CHECK_HEAP;
 		if (vs->hasTwoBuffers) {
-			if (flag & dbClear || !lightsOn)
-				clear8Col(backbuff_ptr, vs->pitch, height);
-			else
+			if (lightsOn)
 				copy8Col(backbuff_ptr, vs->pitch, bgbak_ptr, height);
+			else
+				clear8Col(backbuff_ptr, vs->pitch, height);
 		}
 		CHECK_HEAP;
 





More information about the Scummvm-git-logs mailing list