diff options
author | Filippos Karapetis | 2009-07-03 09:01:51 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-07-03 09:01:51 +0000 |
commit | 9664050ff07214ccd2ae2189475ddde80e7630ef (patch) | |
tree | ac8edeca93c6ab5f0ef0242acd1f0af906719f77 /engines/sci/sci.cpp | |
parent | f3ac0a62c47c33bfb814c89f52f6c2b50092f561 (diff) | |
download | scummvm-rg350-9664050ff07214ccd2ae2189475ddde80e7630ef.tar.gz scummvm-rg350-9664050ff07214ccd2ae2189475ddde80e7630ef.tar.bz2 scummvm-rg350-9664050ff07214ccd2ae2189475ddde80e7630ef.zip |
Simplified the kernel name loading code: Merged the default SCI0 and SCI1 kernel name tables in one table. vocab.999 is only used in SCI0 and SCI01 games if it exists as an override to the default kernel name table (which works with SCI0/SCI01 demos with no vocab.999, like KQ1 and xmas1998). Removed GF_SCI0_SCI1VOCAB.
svn-id: r42050
Diffstat (limited to 'engines/sci/sci.cpp')
-rw-r--r-- | engines/sci/sci.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 9b277b058f..f58d729bf6 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -158,8 +158,7 @@ Common::Error SciEngine::run() { if (flags & GF_SCI0_OLD || flags & GF_SCI0_OLDGFXFUNCS || - flags & GF_SCI0_OLDGETTIME || - flags & GF_SCI0_SCI1VOCAB) { + 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) { @@ -171,8 +170,7 @@ Common::Error SciEngine::run() { if (flags & GF_SCI0_OLD || flags & GF_SCI0_OLDGFXFUNCS || - flags & GF_SCI0_OLDGETTIME || - flags & GF_SCI0_SCI1VOCAB) { + flags & GF_SCI0_OLDGETTIME) { error("This game entry is erroneous. It's marked as SCI1.1/SCI32, but it has SCI0 flags set"); } |