diff options
| author | Travis Howell | 2004-03-03 02:42:51 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-03-03 02:42:51 +0000 |
| commit | a79a0647d762ef2b731c02074f2f3f7e106d9057 (patch) | |
| tree | 524f7d3598a07f13fed47fbd1191f2beed781bd2 | |
| parent | bb97464292ce4885b561d71ce398e107ad6ea078 (diff) | |
| download | scummvm-rg350-a79a0647d762ef2b731c02074f2f3f7e106d9057.tar.gz scummvm-rg350-a79a0647d762ef2b731c02074f2f3f7e106d9057.tar.bz2 scummvm-rg350-a79a0647d762ef2b731c02074f2f3f7e106d9057.zip | |
Adjustments for Enchanced Maniac Mansion demo.
svn-id: r13160
| -rw-r--r-- | scumm/script_v2.cpp | 10 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index f17fcc0239..e621d7ca9f 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -823,15 +823,11 @@ void ScummEngine_v2::o2_verbOps() { vs = &_verbs[slot]; vs->verbid = verb; if (_version == 1) { - if (_gameId == GID_MANIAC && _demoMode) - vs->color = 16; - else - vs->color = 5; - + vs->color = (_gameId == GID_MANIAC && _demoMode) ? 16 : 5; vs->hicolor = 7; vs->dimcolor = 11; } else { - vs->color = 2; + vs->color = (_gameId == GID_MANIAC && _demoMode) ? 13 : 2; vs->hicolor = 14; vs->dimcolor = 8; } @@ -1404,7 +1400,7 @@ void ScummEngine_v2::o2_cutscene() { // FIXME allows quotes script (173) to start during introudction of // demo mode of V1 Maniac Mansion. setUserState was halting script // 173 before it started. - if (!(_gameId == GID_MANIAC && _version == 1 && _demoMode)) + if (!(_gameId == GID_MANIAC && _demoMode)) // Hide inventory, freeze scripts, hide cursor setUserState(15); diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 1abc3c2c53..45aed53b4e 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1041,7 +1041,7 @@ void ScummEngine::scummInit() { _actors[i].initActor(1); // this is from IDB - if (_version == 1) + if ((_version == 1) || (_version == 2 && _demoMode)) _actors[i].setActorCostume(i); } |