aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sci.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-07-04 16:30:20 +0000
committerFilippos Karapetis2009-07-04 16:30:20 +0000
commitb093511239401c5d64d6b21c0b875d5be6e5f239 (patch)
tree935c78d3b317f14074f39acc9e21e87bca1762cb /engines/sci/sci.cpp
parentc5522b37660644666c2842045cf64f1254cc3e17 (diff)
downloadscummvm-rg350-b093511239401c5d64d6b21c0b875d5be6e5f239.tar.gz
scummvm-rg350-b093511239401c5d64d6b21c0b875d5be6e5f239.tar.bz2
scummvm-rg350-b093511239401c5d64d6b21c0b875d5be6e5f239.zip
- Merged the "early" and "late" SCI1 versions - these are functionally equivalent, and the code that does the version check is unreliable (e.g. it sets SQ1 VGA to SCI1 "late" and EcoQuest 1 to SCI1 "early")
- Cleanup of the vocabulary setting functions - Cleanup of the cursor manipulation code svn-id: r42097
Diffstat (limited to 'engines/sci/sci.cpp')
-rw-r--r--engines/sci/sci.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 34db178706..3686126c83 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -147,13 +147,13 @@ Common::Error SciEngine::run() {
_gamestate = new EngineState(_resmgr, version, flags);
// Verify that we haven't got an invalid game detection entry
- if (version < SCI_VERSION_1_EARLY) {
+ if (version < SCI_VERSION_1) {
// SCI0/SCI01
if (flags & GF_SCI1_EGA ||
flags & GF_SCI1_LOFSABSOLUTE) {
error("This game entry is erroneous. It's marked as SCI0/SCI01, but it has SCI1 flags set");
}
- } else if (version >= SCI_VERSION_1_EARLY && version <= SCI_VERSION_1_LATE) {
+ } else if (version == SCI_VERSION_1) {
// SCI1
if (flags & GF_SCI0_OLD ||