diff options
| author | Max Horn | 2006-04-23 00:08:18 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-23 00:08:18 +0000 |
| commit | 660efce9b29fc412ad4ddf502de120f47966f4d7 (patch) | |
| tree | fa134f9bc34a8cddb4879d03de6d23b23491f25e /engines/scumm/script_v2.cpp | |
| parent | db747c21000e0b18da0341684de08e67239a6fca (diff) | |
| download | scummvm-rg350-660efce9b29fc412ad4ddf502de120f47966f4d7.tar.gz scummvm-rg350-660efce9b29fc412ad4ddf502de120f47966f4d7.tar.bz2 scummvm-rg350-660efce9b29fc412ad4ddf502de120f47966f4d7.zip | |
Replaced _demoMode by GF_DEMO
svn-id: r22087
Diffstat (limited to 'engines/scumm/script_v2.cpp')
| -rw-r--r-- | engines/scumm/script_v2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 00e4bfba57..f1683fce26 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -425,7 +425,7 @@ void ScummEngine_v2::decodeParseString() { if (_game.id == GID_MANIAC && _actorToPrintStrFor == 0xFF) { if (_game.platform == Common::kPlatformC64) { _string[textSlot].color = 14; - } else if (_demoMode) { + } else if (_game.features & GF_DEMO) { _string[textSlot].color = (_game.version == 2) ? 15 : 1; } } @@ -711,7 +711,7 @@ void ScummEngine_v2::o2_actorOps() { a->setActorCostume(arg); break; case 5: // SO_TALK_COLOR - if (_game.id == GID_MANIAC && _game.version == 2 && _demoMode && arg == 1) + if (_game.id == GID_MANIAC && _game.version == 2 && (_game.features & GF_DEMO) && arg == 1) a->_talkColor = 15; else a->_talkColor = arg; @@ -844,11 +844,11 @@ void ScummEngine_v2::o2_verbOps() { vs->hicolor = 1; vs->dimcolor = 1; } else if (_game.version == 1) { - vs->color = (_game.id == GID_MANIAC && _demoMode) ? 16 : 5; + vs->color = (_game.id == GID_MANIAC && (_game.features & GF_DEMO)) ? 16 : 5; vs->hicolor = 7; vs->dimcolor = 11; } else { - vs->color = (_game.id == GID_MANIAC && _demoMode) ? 13 : 2; + vs->color = (_game.id == GID_MANIAC && (_game.features & GF_DEMO)) ? 13 : 2; vs->hicolor = 14; vs->dimcolor = 8; } @@ -1467,7 +1467,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 (!(_game.id == GID_MANIAC && _demoMode)) + if (!(_game.id == GID_MANIAC && (_game.features & GF_DEMO))) // Hide inventory, freeze scripts, hide cursor setUserState(15); |