aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorFlorian Kagerer2009-10-10 17:15:10 +0000
committerFlorian Kagerer2009-10-10 17:15:10 +0000
commita15cf067a78f065e1b7f0893efa8c3fe80f518dd (patch)
tree18c37235727fec78262d7819ad35133dd3f4373e /engines/kyra
parentd6f5d93dbf554bf7e133b0de7e675b6453736356 (diff)
downloadscummvm-rg350-a15cf067a78f065e1b7f0893efa8c3fe80f518dd.tar.gz
scummvm-rg350-a15cf067a78f065e1b7f0893efa8c3fe80f518dd.tar.bz2
scummvm-rg350-a15cf067a78f065e1b7f0893efa8c3fe80f518dd.zip
LOL/PC-98: fixed minor glitch in wsa code
svn-id: r44879
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/lol.cpp4
-rw-r--r--engines/kyra/screen.cpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index bfc530bf58..63b0e63f62 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -1386,7 +1386,7 @@ void LoLEngine::setCharacterMagicOrHitPoints(int charNum, int type, int points,
uint32 delayTimer = _system->getMillis() + _tickLength;
- gui_drawLiveMagicBar(barData[type][0] + _activeCharsXpos[charNum], 175, i, 0, pointsMax, 5, 32, barData[type][1], 1, barData[type][3]);
+ gui_drawLiveMagicBar(barData[type][0] + _activeCharsXpos[charNum], 175, i, 0, pointsMax, 5, 32, barData[type][1], _flags.use16ColorMode ? 0x44 : 1, barData[type][3]);
_screen->printText(getLangString(barData[type][4]), barData[type][0] + _activeCharsXpos[charNum], 144, barData[type][2], 0);
_screen->updateScreen();
@@ -3013,7 +3013,7 @@ void LoLEngine::drinkBezelCup(int numUses, int charNum) {
uint32 etime = _system->getMillis() + 4 * _tickLength;
_screen->copyRegion(0, 0, x, y, w, h, 2, 2, Screen::CR_NO_P_CHECK);
- mov->displayFrame(frm, 2, x, y, 0x5000, _trueLightTable1, _trueLightTable2);
+ mov->displayFrame(frm, 2, x, y, _flags.use16ColorMode ? 0x4000 : 0x5000, _trueLightTable1, _trueLightTable2);
_screen->copyRegion(x, y, x, y, w, h, 2, 0, Screen::CR_NO_P_CHECK);
_screen->updateScreen();
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 0385fce913..69ebcbb649 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -475,7 +475,8 @@ void Screen::copyWsaRect(int x, int y, int w, int h, int dimState, int plotFunc,
if (_curPage == 0 || _curPage == 1)
addDirtyRect(x, y, w, h);
- clearOverlayRect(_curPage, x, y, w, h);
+ if (!_use16ColorMode)
+ clearOverlayRect(_curPage, x, y, w, h);
temp = h;
int curY = y;