aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/scene_lol.cpp
diff options
context:
space:
mode:
authorFlorian Kagerer2009-10-13 19:48:41 +0000
committerFlorian Kagerer2009-10-13 19:48:41 +0000
commit73fa80d94088cfac87f4302112bff5c3b2fb9754 (patch)
treef779d6a429d41df0d55235cb41f874046f2c9605 /engines/kyra/scene_lol.cpp
parent94cd10297406f4b57d6d0d38a3ac3be18311f22b (diff)
downloadscummvm-rg350-73fa80d94088cfac87f4302112bff5c3b2fb9754.tar.gz
scummvm-rg350-73fa80d94088cfac87f4302112bff5c3b2fb9754.tar.bz2
scummvm-rg350-73fa80d94088cfac87f4302112bff5c3b2fb9754.zip
LOL/PC-98: fixed outro
svn-id: r45046
Diffstat (limited to 'engines/kyra/scene_lol.cpp')
-rw-r--r--engines/kyra/scene_lol.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index a91120746d..82930ef36d 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -397,9 +397,7 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight
delete[] _vcnBlocks;
_vcnBlocks = new uint8[vcnLen];
- if (_flags.use16ColorMode) {
- _res->loadFileToBuf("LOL.NOL", _screen->getPalette(0).getData(), 48);
- } else {
+ if (!_flags.use16ColorMode) {
delete[] _vcnShift;
_vcnShift = new uint8[tlen];
@@ -453,16 +451,17 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight
_vmpPtr[i] = READ_LE_UINT16(&v[i << 1]);
Palette tpal(256);
- tpal.copy(_screen->getPalette(0));
if (_flags.use16ColorMode) {
- tpal.fill(16, 240, 0xff);
uint8 *dst = tpal.getData();
+ _res->loadFileToBuf("LOL.NOL", dst, 48);
for (int i = 1; i < 16; i++) {
int s = ((i << 4) | i) * 3;
SWAP(dst[s], dst[i * 3]);
SWAP(dst[s + 1], dst[i * 3 + 1]);
SWAP(dst[s + 2], dst[i * 3 + 2]);
}
+ } else {
+ tpal.copy(_screen->getPalette(0));
}
for (int i = 0; i < 7; i++) {