diff options
| author | Vincent Bénony | 2016-01-06 16:20:23 +0100 |
|---|---|---|
| committer | Vincent Bénony | 2016-01-06 16:20:23 +0100 |
| commit | efdb5679ce6304dbc854afbbc511e633d7513338 (patch) | |
| tree | e680a240e5f6018fc3a4cce53b50060caa22a929 /engines/sci/console.cpp | |
| parent | 4687ff6d6d2863cc95c8137543ecf9c39bc01723 (diff) | |
| parent | b72c02bad44749a1355acefdb198e36b2e772575 (diff) | |
| download | scummvm-rg350-efdb5679ce6304dbc854afbbc511e633d7513338.tar.gz scummvm-rg350-efdb5679ce6304dbc854afbbc511e633d7513338.tar.bz2 scummvm-rg350-efdb5679ce6304dbc854afbbc511e633d7513338.zip | |
IOS: Merge branch 'master' into ios-fix
Diffstat (limited to 'engines/sci/console.cpp')
| -rw-r--r-- | engines/sci/console.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 1e95393e4d..5cd7b9f7ca 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -483,9 +483,7 @@ bool Console::cmdGetVersion(int argc, const char **argv) { debugPrintf("Move count type: %s\n", (_engine->_features->handleMoveCount()) ? "increment" : "ignore"); debugPrintf("SetCursor type: %s\n", getSciVersionDesc(_engine->_features->detectSetCursorType())); #ifdef ENABLE_SCI32 - if (getSciVersion() >= SCI_VERSION_2) - debugPrintf("kString type: %s\n", (_engine->_features->detectSci2StringFunctionType() == kSci2StringFunctionOld) ? "SCI2 (old)" : "SCI2.1 (new)"); - if (getSciVersion() == SCI_VERSION_2_1) + if ((getSciVersion() >= SCI_VERSION_2_1_EARLY) && (getSciVersion() <= SCI_VERSION_2_1_LATE)) debugPrintf("SCI2.1 kernel table: %s\n", (_engine->_features->detectSci21KernelType() == SCI_VERSION_2) ? "modified SCI2 (old)" : "SCI2.1 (new)"); #endif debugPrintf("View type: %s\n", viewTypeDesc[g_sci->getResMan()->getViewType()]); @@ -1046,7 +1044,7 @@ bool Console::cmdVerifyScripts(int argc, const char **argv) { if (!script) debugPrintf("Error: script %d couldn't be loaded\n", itr->getNumber()); - if (getSciVersion() <= SCI_VERSION_2_1) { + if (getSciVersion() <= SCI_VERSION_2_1_LATE) { heap = _engine->getResMan()->findResource(ResourceId(kResourceTypeHeap, itr->getNumber()), false); if (!heap) debugPrintf("Error: script %d doesn't have a corresponding heap\n", itr->getNumber()); |