libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-29 23:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't do dynalum if palette scroll is disabled

Browse Source 
svn-id: r11032
This commit is contained in:
Gregory Montoir 2003-11-01 20:46:35 +00:00
parent 885fd48a66
commit e6eb3e234d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
queen/display.cpp
View File

@ -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) {

2
queen/display.h
View File

@ -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: