aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2002-08-29 16:57:43 +0000
committerMax Horn2002-08-29 16:57:43 +0000
commitbbcae3efbec9d22266a80b8cd3403d477caa7f21 (patch)
tree5edb69fa78078091ca32c0acdbce5ce07aed4c57 /common
parent0cf920e0403408b3e01787ed8d3ac9a6dd7a5a9c (diff)
downloadscummvm-rg350-bbcae3efbec9d22266a80b8cd3403d477caa7f21.tar.gz
scummvm-rg350-bbcae3efbec9d22266a80b8cd3403d477caa7f21.tar.bz2
scummvm-rg350-bbcae3efbec9d22266a80b8cd3403d477caa7f21.zip
experimental support for the V2 resource format (patch #601560)
svn-id: r4864
Diffstat (limited to 'common')
-rw-r--r--common/engine.cpp4
-rw-r--r--common/gameDetector.cpp8
2 files changed, 9 insertions, 3 deletions
diff --git a/common/engine.cpp b/common/engine.cpp
index bd416f5f70..9a53b69094 100644
--- a/common/engine.cpp
+++ b/common/engine.cpp
@@ -85,7 +85,9 @@ Engine *Engine::createFromDetector(GameDetector *detector, OSystem *syst)
engine = new SimonState(detector, syst);
} else {
// Some kind of Scumm game
- if (detector->_features & GF_OLD256)
+ if (detector->_features & GF_OLD_BUNDLE)
+ engine = new Scumm_v2(detector, syst);
+ else if (detector->_features & GF_OLD256)
engine = new Scumm_v3(detector, syst);
else if (detector->_features & GF_SMALL_HEADER) // this force loomCD as v4
engine = new Scumm_v4(detector, syst);
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp
index 421dfd782e..581767c58d 100644
--- a/common/gameDetector.cpp
+++ b/common/gameDetector.cpp
@@ -350,8 +350,12 @@ static const VersionSettings version_settings[] = {
// {"zak", "Zak McKracken and the Alien Mindbenders (C64)", GID_ZAK64, 1, 0, 0,},
/* Scumm Version 2 */
-// {"maniac", "Maniac Mansion", GID_MANIAC, 2, 0, 0,},
-// {"zak", "Zak McKracken and the Alien Mindbenders", GID_ZAK, 2, 0, 0,},
+// {"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},
+// {"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},
// {"indy3", "Indiana Jones and the Last Crusade", GID_INDY3, 2, 0, 0,},
/* Scumm Version 3 */