aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sci.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2009-06-25 00:14:07 +0000
committerMatthew Hoops2009-06-25 00:14:07 +0000
commit4df9dd82fb2a4e9f5772368ec869788e64e380ff (patch)
tree64e54ff4445407706a9daa40e7cf72ba1bdd8ad8 /engines/sci/sci.cpp
parentd03dc08b64073044267fb4b3ca6704fd62a19741 (diff)
downloadscummvm-rg350-4df9dd82fb2a4e9f5772368ec869788e64e380ff.tar.gz
scummvm-rg350-4df9dd82fb2a4e9f5772368ec869788e64e380ff.tar.bz2
scummvm-rg350-4df9dd82fb2a4e9f5772368ec869788e64e380ff.zip
After discussing with waltervn, committing my fix for the King's Quest I Demo (original from Patch #2795916). I'm also fixing the full game as well :)
svn-id: r41841
Diffstat (limited to 'engines/sci/sci.cpp')
-rw-r--r--engines/sci/sci.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index f58d729bf6..9b277b058f 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -158,7 +158,8 @@ Common::Error SciEngine::run() {
if (flags & GF_SCI0_OLD ||
flags & GF_SCI0_OLDGFXFUNCS ||
- flags & GF_SCI0_OLDGETTIME) {
+ flags & GF_SCI0_OLDGETTIME ||
+ flags & GF_SCI0_SCI1VOCAB) {
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) {
@@ -170,7 +171,8 @@ Common::Error SciEngine::run() {
if (flags & GF_SCI0_OLD ||
flags & GF_SCI0_OLDGFXFUNCS ||
- flags & GF_SCI0_OLDGETTIME) {
+ flags & GF_SCI0_OLDGETTIME ||
+ flags & GF_SCI0_SCI1VOCAB) {
error("This game entry is erroneous. It's marked as SCI1.1/SCI32, but it has SCI0 flags set");
}