From e6eb3e234d4188a6753bfa3bf0cf637e6c716316 Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Sat, 1 Nov 2003 20:46:35 +0000
Subject: don't do dynalum if palette scroll is disabled

svn-id: r11032
---
 queen/display.cpp | 6 +++---
 queen/display.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'queen')

diff --git a/queen/display.cpp b/queen/display.cpp
index 1b926c27c5..871fa84b0e 100644
--- a/queen/display.cpp
+++ b/queen/display.cpp
@@ -187,7 +187,7 @@ void Display::dynalumUpdate(int16 x, int16 y) {
 	}
 
 	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::palSet(const uint8 *pal, int start, int end, bool updateScreen) {
 
 void Display::palSetJoe(JoePalette pal) {
 
+	debug(9, "Display::palSetJoe(%d)", pal);
 	const uint8 *palJoe = NULL;
 	switch (pal) {
 	case JP_CLOTHES:
@@ -589,7 +590,6 @@ void Display::palCustomScroll(uint16 roomNum) {
     }
 	_pals.dirtyMin = MIN(_pals.dirtyMin, loPal);
 	_pals.dirtyMax = MAX(_pals.dirtyMax, hiPal);
-    // XXX dynalum();
 }
 
 
@@ -663,7 +663,7 @@ void Display::prepareUpdate() {
 
 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) {
diff --git a/queen/display.h b/queen/display.h
index b8b4f7bff9..4fe4ebf8fa 100644
--- a/queen/display.h
+++ b/queen/display.h
@@ -104,7 +104,7 @@ public:
 	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:
-- 
cgit v1.2.3