[Scummvm-cvs-logs] CVS: scummvm/queen display.h,1.9,1.10 display.cpp,1.14,1.15

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv30576

Modified Files:
	display.h display.cpp 
Log Message:
safer dynalum tweak

Index: display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- display.h	28 Oct 2003 14:19:11 -0000	1.9
+++ display.h	28 Oct 2003 15:05:34 -0000	1.10
@@ -43,8 +43,7 @@
 
 
 struct Dynalum {
-	bool haveMsk;
-	bool haveLum;
+	bool valid;
 	uint8 msk[50 * 160];
 	int8 lum[8 * 3];
 	uint8 prevColMask;

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- display.cpp	28 Oct 2003 14:19:11 -0000	1.14
+++ display.cpp	28 Oct 2003 15:05:35 -0000	1.15
@@ -143,18 +143,19 @@
 	debug(9, "Display::dynalumInit(%s, %d)", roomName, roomNum);
 	memset(_dynalum.msk, 0, sizeof(_dynalum.msk));
 	memset(_dynalum.lum, 0, sizeof(_dynalum.lum));
+	_dynalum.valid = false;
 	// FIXME: are these tests really needed ?
 	if (roomNum < 90 || ((roomNum > 94) && (roomNum < 114))) {
 		char filename[20];
 
 		sprintf(filename, "%s.msk", roomName);
-		_dynalum.haveMsk = resource->exists(filename);
-		if (_dynalum.haveMsk)
+		_dynalum.valid = resource->exists(filename);
+		if (_dynalum.valid)
 			resource->loadFile(filename, 0, (uint8*)_dynalum.msk);
 
 		sprintf(filename, "%s.lum", roomName);
-		_dynalum.haveLum = resource->exists(filename);
-		if (_dynalum.haveLum)
+		_dynalum.valid = resource->exists(filename);
+		if (_dynalum.valid)
 			resource->loadFile(filename, 0, (uint8*)_dynalum.lum);
 	}
 }
@@ -162,7 +163,7 @@
 
 void Display::dynalumUpdate(int x, int y) {
 
-	if (!_dynalum.haveMsk)
+	if (!_dynalum.valid)
 		return;
 
 	if (x >= _bdWidth) {