diff options
| -rw-r--r-- | scumm/resource_v2.cpp | 7 | ||||
| -rw-r--r-- | scumm/script_v2.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 8 |
4 files changed, 6 insertions, 13 deletions
diff --git a/scumm/resource_v2.cpp b/scumm/resource_v2.cpp index c8beb528b5..3414696650 100644 --- a/scumm/resource_v2.cpp +++ b/scumm/resource_v2.cpp @@ -27,20 +27,18 @@ void Scumm_v2::readClassicIndexFile() { int i; - if (_gameId == GID_MANIAC64) { + if (_gameId == GID_MANIAC) { _numGlobalObjects = 800; _numRooms = 55; _numCostumes = 35; _numScripts = 200; _numSounds = 100; - } else if (_gameId == GID_ZAK64) { + } else if (_gameId == GID_ZAK) { _numGlobalObjects = 775; _numRooms = 61; _numCostumes = 37; _numScripts = 155; _numSounds = 120; - } else { - error("Scumm_v1::readEchancedIndexFile(). Unknown game variant."); } _fileHandle.seek(0, SEEK_SET); @@ -148,6 +146,7 @@ void Scumm_v2::readIndexFile() { break; case 0x0A31: warning("Classic V1 game detected"); + setFeatures(_features | GF_AFTER_V1); readClassicIndexFile(); break; default: diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index ddc7f5d11a..25ebfbe207 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -1245,7 +1245,7 @@ void Scumm_v2::o2_endCutscene() { _userPut = 1; _cursor.state = 1; - if (_gameId == GID_MANIAC || _gameId == GID_MANIAC64) { + if (_gameId == GID_MANIAC) { camera._mode = (byte) vm.cutSceneData[3]; if (camera._mode == CM_FOLLOW_ACTOR) { actorFollowCamera(VAR(VAR_EGO)); diff --git a/scumm/scumm.h b/scumm/scumm.h index 3afc33d491..8635913dd5 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -182,8 +182,6 @@ enum ScummGameId { GID_CMI, GID_MANIAC, GID_ZAK, - GID_MANIAC64, - GID_ZAK64, GID_PUTTDEMO }; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 9de8fe8edf..495aff6ba7 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -85,12 +85,8 @@ extern uint16 _debugLevel; static const VersionSettings scumm_settings[] = { /* Scumm Version 1 */ - {"maniac64", "Maniac Mansion (C64)", GID_MANIAC64, 1, 0, 0, - GF_AFTER_V1 | GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"}, - {"zak64", "Zak McKracken and the Alien Mindbenders (C64)", GID_ZAK64, 1, 0, 0, - GF_AFTER_V1 | GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"}, - /* Scumm Version 2 */ + {"maniac", "Maniac Mansion", GID_MANIAC, 2, 0, 0, GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"}, {"zak", "Zak McKracken and the Alien Mindbenders", GID_ZAK, 2, 0, 0, @@ -2440,7 +2436,7 @@ void Scumm::launch() { _numActors = 80; else if ((_features & GF_AFTER_V7) || (_gameId == GID_SAMNMAX)) _numActors = 30; - else if (_gameId == GID_MANIAC || _gameId == GID_MANIAC64) + else if (_gameId == GID_MANIAC) _numActors = 25; else _numActors = 13; |