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

[Gregory Montoir]

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

Modified Files:
	display.h display.cpp 
Log Message:
don't do dynalum if palette scroll is disabled

Index: display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- display.h	31 Oct 2003 13:47:27 -0000	1.14
+++ display.h	1 Nov 2003 20:46:35 -0000	1.15
@@ -104,7 +104,7 @@
 	void handleTimer();
 	void waitForTimer();
 
-	void mouseCursorInit(uint8* buf, uint16 w, uint16 h, uint16 xhs, uint16 yhs);
+	void mouseCursorInit(uint8 *buf, uint16 w, uint16 h, uint16 xhs, uint16 yhs);
 	void mouseCursorShow(bool show);
 
 private:

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- display.cpp	31 Oct 2003 10:11:27 -0000	1.18
+++ display.cpp	1 Nov 2003 20:46:35 -0000	1.19
@@ -187,7 +187,7 @@
 	}
 
 	uint8 colMask = _dynalum.msk[offset];
-	debug(9, "Graphics::dynalumUpdate(%d, %d) - colMask = %d", x, y, colMask);
+	debug(9, "Display::dynalumUpdate(%d, %d) - colMask = %d", x, y, colMask);
 
 	if (colMask != _dynalum.prevColMask) {
 		uint8 i;
@@ -238,6 +238,7 @@
 
 void Display::palSetJoe(JoePalette pal) {
 
+	debug(9, "Display::palSetJoe(%d)", pal);
 	const uint8 *palJoe = NULL;
 	switch (pal) {
 	case JP_CLOTHES:
@@ -589,7 +590,6 @@
     }
 	_pals.dirtyMin = MIN(_pals.dirtyMin, loPal);
 	_pals.dirtyMax = MAX(_pals.dirtyMax, hiPal);
-    // XXX dynalum();
 }
 
 
@@ -663,7 +663,7 @@
 
 void Display::update(bool dynalum, int16 dynaX, int16 dynaY) {
 
-	if (dynalum) {
+	if (_pals.scrollable && dynalum) {
 		dynalumUpdate(dynaX, dynaY);
 	}
 	if (_pals.dirtyMin != 144 || _pals.dirtyMax != 144) {