[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.64,2.65 scumm.h,1.174,1.175 scummvm.cpp,2.116,2.117 vars.cpp,1.43,1.44

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv22488

Modified Files:
	gfx.cpp scumm.h scummvm.cpp vars.cpp 
Log Message:
VAR_V5_DRAWFLAGS == VAR_CURRENT_LIGHTS; fixed bug #601139

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.64
retrieving revision 2.65
diff -u -d -r2.64 -r2.65
--- gfx.cpp	30 Apr 2003 13:23:27 -0000	2.64
+++ gfx.cpp	30 Apr 2003 21:30:55 -0000	2.65
@@ -611,6 +611,9 @@
 	_flashlight.x = x - _flashlight.w / 2 - _screenStartStrip * 8;
 	_flashlight.y = y - _flashlight.h / 2;
 
+	if (_gameId == GID_LOOM || _gameId == GID_LOOM256)
+		_flashlight.y -= 12;
+
 	// Clip the flashlight at the borders
 	if (_flashlight.x < 0)
 		_flashlight.x = 0;
@@ -737,6 +740,7 @@
 	VirtScreen *vs;
 	int topline, height, width;
 	byte *backbuff, *bgbak;
+	bool lightsOn;
 
 	if (left == right || top == bottom)
 		return;
@@ -769,7 +773,10 @@
 	height = bottom - top;
 	width = right - left;
 
-	if (vs->alloctwobuffers && _currentRoom != 0 /*&& _vars[VAR_V5_DRAWFLAGS]&2 */ ) {
+	// Check whether lights are turned on or not
+	lightsOn = (_features & GF_AFTER_V6) || (vs->number != 0) || (_vars[VAR_CURRENT_LIGHTS] & LIGHTMODE_screen);
+
+	if (vs->alloctwobuffers && _currentRoom != 0 && lightsOn ) {
 		blit(backbuff, bgbak, width, height);
 		if (vs->number == 0 && _charset->_hasMask && height) {
 			byte *mask;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- scumm.h	30 Apr 2003 13:23:30 -0000	1.174
+++ scumm.h	30 Apr 2003 21:30:57 -0000	1.175
@@ -1111,7 +1111,6 @@
 	byte VAR_NEW_ROOM;
 	byte VAR_VERSION;
 
-	byte VAR_V5_DRAWFLAGS;
 	byte VAR_MI1_TIMER;
 	byte VAR_V5_TALK_STRING_Y;
 	byte VAR_V5_CHARFLAG;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.116
retrieving revision 2.117
diff -u -d -r2.116 -r2.117
--- scummvm.cpp	30 Apr 2003 13:23:30 -0000	2.116
+++ scummvm.cpp	30 Apr 2003 21:30:57 -0000	2.117
@@ -694,7 +694,6 @@
 		if (_features & GF_AFTER_V6)
 			_vars[VAR_V6_EMSSPACE] = 10000;
 
-		_vars[VAR_V5_DRAWFLAGS] = 11;
 		_vars[VAR_59] = 3;
 
 		// Setup light

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- vars.cpp	30 Apr 2003 11:15:11 -0000	1.43
+++ vars.cpp	30 Apr 2003 21:30:59 -0000	1.44
@@ -94,7 +94,6 @@
 	VAR_NEW_ROOM = 72;	// Zak256 Note: Cashcard for Leslie
 	VAR_VERSION = 75;
 
-	VAR_V5_DRAWFLAGS = 9;
 	VAR_MI1_TIMER = 14;
 
 	VAR_V5_TALK_STRING_Y = 54;
@@ -199,7 +198,6 @@
 	VAR_VIDEONAME = 123;
 	VAR_CUSTOMSCALETABLE = 131;
 
-	//VAR_V5_DRAWFLAGS = 9;
 	VAR_MI1_TIMER = 14;
 	VAR_V5_TALK_STRING_Y = 54;
 	VAR_V5_CHARFLAG = 60;