diff options
author | Travis Howell | 2003-12-15 11:06:41 +0000 |
---|---|---|
committer | Travis Howell | 2003-12-15 11:06:41 +0000 |
commit | 09495a7fc9ee4554c996c7ed159f7781664a0bbe (patch) | |
tree | 34e7a96f480f64c61dcc1b8acbb47cfa8c5eed99 /scumm | |
parent | 4e736a66029891232b0c1dd24fbb573dfde76653 (diff) | |
download | scummvm-rg350-09495a7fc9ee4554c996c7ed159f7781664a0bbe.tar.gz scummvm-rg350-09495a7fc9ee4554c996c7ed159f7781664a0bbe.tar.bz2 scummvm-rg350-09495a7fc9ee4554c996c7ed159f7781664a0bbe.zip |
Small color table correction for demo mode of v1 maniac
svn-id: r11650
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/saveload.cpp | 7 | ||||
-rw-r--r-- | scumm/script_v2.cpp | 2 | ||||
-rw-r--r-- | scumm/scummvm.cpp | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index f9fbdc9430..986657f936 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -178,9 +178,12 @@ bool ScummEngine::loadState(int slot, bool compat, SaveFileManager *mgr) { // ever add options for using different 16-colour palettes. if (_version == 1) { - if (_gameId == GID_MANIAC) + if (_gameId == GID_MANIAC) { setupV1ManiacPalette(); - else + if (_demoMode) + setPalColor(15, 252, 84, 252); + + } else setupV1ZakPalette(); } else if (_features & GF_16COLOR) { if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST)) diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 5466be9c2b..279d179d70 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -825,7 +825,7 @@ void ScummEngine_v2::o2_verbOps() { vs->verbid = verb; if (_version == 1) { if (_gameId == GID_MANIAC && _demoMode) - vs->color = 4; + vs->color = 15; else vs->color = 5; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index a986821294..c8f0915189 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1019,9 +1019,11 @@ void ScummEngine::scummInit() { for (i = 0; i < 256; i++) _roomPalette[i] = i; if (_version == 1) { - if (_gameId == GID_MANIAC) + if (_gameId == GID_MANIAC) { setupV1ManiacPalette(); - else + if (_demoMode) + setPalColor(15, 252, 84, 252); + } else setupV1ZakPalette(); } else if (_features & GF_16COLOR) { for (i = 0; i < 16; i++) |