aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFlorian Kagerer2009-10-08 20:22:12 +0000
committerFlorian Kagerer2009-10-08 20:22:12 +0000
commitf8cdacdeeacd722031a1ce8d9426b7e1059e24c9 (patch)
tree368b26cd51277f6045786570fdca5143b6296e0f /engines
parentb0eeb3636ca801e2f40ef05b014d3ec40488704f (diff)
downloadscummvm-rg350-f8cdacdeeacd722031a1ce8d9426b7e1059e24c9.tar.gz
scummvm-rg350-f8cdacdeeacd722031a1ce8d9426b7e1059e24c9.tar.bz2
scummvm-rg350-f8cdacdeeacd722031a1ce8d9426b7e1059e24c9.zip
LOLLOL/PC-98: fixed add-spell-to-scroll animation
svn-id: r44797
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/lol.cpp6
-rw-r--r--engines/kyra/screen.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 2c1507e213..3fe04268d2 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -3057,17 +3057,21 @@ void LoLEngine::transferSpellToScollAnimation(int charNum, int spell, int slot)
_screen->copyRegion(201, 1, 17, 15, 6, h, 2, 2, Screen::CR_NO_P_CHECK);
_screen->copyRegion(208, 1, 89, 15, 6, h, 2, 2, Screen::CR_NO_P_CHECK);
int cp = _screen->setCurPage(2);
- _screen->fillRect(21, 15, 89, h + 15, 206);
+ _screen->fillRect(21, 15, 89, h + 15, _flags.use16ColorMode ? 0xbb : 206);
_screen->copyRegion(112, 16, 12, h + 15, 87, 14, 2, 2, Screen::CR_NO_P_CHECK);
int y = 15;
+ Screen::FontId of = _screen->setFont(Screen::FID_9_FNT);
for (int ii = 0; ii < 7; ii++) {
if (_availableSpells[ii] == -1)
continue;
uint8 col = (ii == _selectedSpell) ? 132 : 1;
+ if (_flags.use16ColorMode)
+ col = (ii == _selectedSpell) ? 0x88 : 0x44;
_screen->fprintString("%s", 24, y, col, 0, 0, getLangString(_spellProperties[_availableSpells[ii]].spellNameCode));
y += 9;
}
+ _screen->setFont(of);
_screen->setCurPage(cp);
_screen->copyRegion(8, 0, 8, 0, 96, 120, 3, 0, Screen::CR_NO_P_CHECK);
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 43299b47b9..fde7b5718d 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -3047,6 +3047,8 @@ byte *Screen::getOverlayPtr(int page) {
return _sjisOverlayPtrs[3];
if (page == 6 || page == 7)
return _sjisOverlayPtrs[4];
+ if (page == 12 || page == 13)
+ return _sjisOverlayPtrs[3];
}
return 0;