aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJames Brown2002-12-12 16:29:21 +0000
committerJames Brown2002-12-12 16:29:21 +0000
commitce4690c7c6de9a47c45afc2f451709f9ddd98b8d (patch)
treef42b296bb059ac79aed0b84bd67c1609d7f59c38 /common
parent57d8bb978f8808b5884a717a4d032b68eab4db76 (diff)
downloadscummvm-rg350-ce4690c7c6de9a47c45afc2f451709f9ddd98b8d.tar.gz
scummvm-rg350-ce4690c7c6de9a47c45afc2f451709f9ddd98b8d.tar.bz2
scummvm-rg350-ce4690c7c6de9a47c45afc2f451709f9ddd98b8d.zip
Tidy one or two things up for future V1/V2/V8 SCUMM support.
svn-id: r5915
Diffstat (limited to 'common')
-rw-r--r--common/gameDetector.cpp8
-rw-r--r--common/gameDetector.h6
2 files changed, 8 insertions, 6 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp
index dc5a3245bc..6610ff364a 100644
--- a/common/gameDetector.cpp
+++ b/common/gameDetector.cpp
@@ -432,12 +432,12 @@ bool GameDetector::parseMusicDriver(const char *s) {
const VersionSettings version_settings[] = {
/* Scumm Version 1 */
-// {"maniac", "Maniac Mansion (C64)", GID_MANIAC64, 1, 0, 0,},
-// {"zak", "Zak McKracken and the Alien Mindbenders (C64)", GID_ZAK64, 1, 0, 0,},
+// {"maniac64", "Maniac Mansion (C64)", GID_MANIAC64, 1, 0, 0,},
+// {"zak64", "Zak McKracken and the Alien Mindbenders (C64)", GID_ZAK64, 1, 0, 0,},
/* Scumm Version 2 */
-// {"maniac", "Maniac Mansion", GID_MANIAC, 2, 0, 0,
-// GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "MANIACEX.EXE"},
+ {"maniac", "Maniac Mansion", GID_MANIAC, 2, 0, 0,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "MANIACEX.EXE"},
// {"zak", "Zak McKracken and the Alien Mindbenders", GID_ZAK, 2, 0, 0,
// GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "ZAKEXE.EXE"},
// {"indy3", "Indiana Jones and the Last Crusade", GID_INDY3, 2, 0, 0,},
diff --git a/common/gameDetector.h b/common/gameDetector.h
index d84840723b..fb271a4685 100644
--- a/common/gameDetector.h
+++ b/common/gameDetector.h
@@ -49,8 +49,10 @@ enum GameId {
GID_DIG = 12,
GID_MONKEY_VGA = 13,
GID_CMI = 14,
- //GID_MANIAC = 15;
- //GID_ZAK = 16;
+ GID_MANIAC = 15,
+ GID_ZAK = 16,
+ //GID_MANIAC64 = 17,
+ //GID_ZAK64 = 18,
/* Simon the Sorcerer */
GID_SIMON_FIRST = 20,