aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sci.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-07-07 10:28:05 +0000
committerFilippos Karapetis2009-07-07 10:28:05 +0000
commitd55f7e72d0af649c472ccc8bb34a408ead3ae7f4 (patch)
tree3a3517ff44a979c4e8c8c2e3135c9781457bbf42 /engines/sci/sci.cpp
parente4f6330418d0261c5270d178c39412b8a850c6b7 (diff)
downloadscummvm-rg350-d55f7e72d0af649c472ccc8bb34a408ead3ae7f4.tar.gz
scummvm-rg350-d55f7e72d0af649c472ccc8bb34a408ead3ae7f4.tar.bz2
scummvm-rg350-d55f7e72d0af649c472ccc8bb34a408ead3ae7f4.zip
Added auto-detection for games with older headers for script blocks, and removed game flag GF_SCI0_OLD
svn-id: r42211
Diffstat (limited to 'engines/sci/sci.cpp')
-rw-r--r--engines/sci/sci.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 698983acaf..09c433edc2 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -151,19 +151,13 @@ Common::Error SciEngine::run() {
if (version < SCI_VERSION_1) {
// SCI0/SCI01
} else if (version == SCI_VERSION_1) {
- // SCI1
-
- if (flags & GF_SCI0_OLD ||
- flags & GF_SCI0_OLDGETTIME) {
+ if (flags & GF_SCI0_OLDGETTIME) {
error("This game entry is erroneous. It's marked as SCI1, but it has SCI0 flags set");
}
} else if (version == SCI_VERSION_1_1 || version == SCI_VERSION_32) {
- if (flags & GF_SCI0_OLD ||
- flags & GF_SCI0_OLDGETTIME) {
+ if (flags & GF_SCI0_OLDGETTIME) {
error("This game entry is erroneous. It's marked as SCI1.1/SCI32, but it has SCI0 flags set");
}
-
- // SCI1.1 / SCI32
} else {
error ("Unknown SCI version in game entry");
}