[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.373,2.374 script_v72he.cpp,2.177,2.178

Travis Howell kirben at users.sourceforge.net
Sat Oct 16 23:08:09 CEST 2004


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

Modified Files:
	gfx.cpp script_v72he.cpp 
Log Message:

Check if VAR_WIZ_TCOLOR is set, before using it.
BMAP images are only used in HE71+.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.373
retrieving revision 2.374
diff -u -d -r2.373 -r2.374
--- gfx.cpp	17 Oct 2004 05:04:49 -0000	2.373
+++ gfx.cpp	17 Oct 2004 06:07:44 -0000	2.374
@@ -631,6 +631,11 @@
 }
 
 void ScummEngine_v70he::redrawBGAreas() {
+	if (_heversion == 70) {
+		ScummEngine::redrawBGAreas();
+		return;
+	}
+
 	int val = 0;
 	if (camera._cur.x != camera._last.x && _charset->_hasMask)
 		stopTalk();

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.177
retrieving revision 2.178
diff -u -d -r2.177 -r2.178
--- script_v72he.cpp	17 Oct 2004 05:04:49 -0000	2.177
+++ script_v72he.cpp	17 Oct 2004 06:07:45 -0000	2.178
@@ -925,7 +925,7 @@
 
 		int w = rCapt.width();
 		int h = rCapt.height();
-		int tColor = VAR(VAR_WIZ_TCOLOR);
+		int tColor = (VAR_WIZ_TCOLOR != 0xFF) ? VAR(VAR_WIZ_TCOLOR) : 5;
 
 		// compute compressed size
 		int dataSize = 0;





More information about the Scummvm-git-logs mailing list