From cb2306373d9b1be5d61e25999af249fb6632865d Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Tue, 28 Oct 2003 15:05:35 +0000
Subject: safer dynalum tweak

svn-id: r10992
---
 queen/display.cpp | 11 ++++++-----
 queen/display.h   |  3 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'queen')

diff --git a/queen/display.cpp b/queen/display.cpp
index 29730132fd..29654a7f11 100644
--- a/queen/display.cpp
+++ b/queen/display.cpp
@@ -143,18 +143,19 @@ void Display::dynalumInit(Resource *resource, const char *roomName, uint16 roomN
 	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::dynalumInit(Resource *resource, const char *roomName, uint16 roomN
 
 void Display::dynalumUpdate(int x, int y) {
 
-	if (!_dynalum.haveMsk)
+	if (!_dynalum.valid)
 		return;
 
 	if (x >= _bdWidth) {
diff --git a/queen/display.h b/queen/display.h
index 24608b3345..da012fa9a5 100644
--- a/queen/display.h
+++ b/queen/display.h
@@ -43,8 +43,7 @@ enum JoePalette {
 
 
 struct Dynalum {
-	bool haveMsk;
-	bool haveLum;
+	bool valid;
 	uint8 msk[50 * 160];
 	int8 lum[8 * 3];
 	uint8 prevColMask;
-- 
cgit v1.2.3