aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorFilippos Karapetis2010-11-21 02:06:20 +0000
committerFilippos Karapetis2010-11-21 02:06:20 +0000
commitac7c488c7c646465a112c48e947d0da055379a8b (patch)
tree13bdb86070484ada54d340beb7a9f55626b6c154 /engines/sci
parent97d31c6ac66a9acc514f6cd6b98b12a49e323faa (diff)
downloadscummvm-rg350-ac7c488c7c646465a112c48e947d0da055379a8b.tar.gz
scummvm-rg350-ac7c488c7c646465a112c48e947d0da055379a8b.tar.bz2
scummvm-rg350-ac7c488c7c646465a112c48e947d0da055379a8b.zip
SCI: kArray wasn't changed in late SCI2.1/SCI3 games (thanks to waltervn)
svn-id: r54402
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/console.cpp2
-rw-r--r--engines/sci/engine/klists.cpp12
2 files changed, 1 insertions, 13 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index c8b62d710d..7e731bdd35 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -453,7 +453,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
- DebugPrintf("kString/kArray type: %s\n", (_engine->_features->detectSci2StringFunctionType() == kSci2StringFunctionOld) ? "SCI2 (old)" : "SCI2.1 (new)");
+ DebugPrintf("kString type: %s\n", (_engine->_features->detectSci2StringFunctionType() == kSci2StringFunctionOld) ? "SCI2 (old)" : "SCI2.1 (new)");
#endif
DebugPrintf("View type: %s\n", viewTypeDesc[g_sci->getResMan()->getViewType()]);
DebugPrintf("Uses palette merging: %s\n", g_sci->_gfxPalette->isMerging() ? "yes" : "no");
diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp
index 5fb2d587ba..329e5cd531 100644
--- a/engines/sci/engine/klists.cpp
+++ b/engines/sci/engine/klists.cpp
@@ -641,11 +641,6 @@ reg_t kArray(EngineState *s, int argc, reg_t *argv) {
}
}
- if (g_sci->_features->detectSci2StringFunctionType() == kSci2StringFunctionNew) {
- if (op >= 6) // Cpy, Cmp have been removed
- op += 2;
- }
-
switch (op) {
case 0: { // New
reg_t arrayHandle;
@@ -776,13 +771,6 @@ reg_t kArray(EngineState *s, int argc, reg_t *argv) {
return argv[1];
return readSelector(s->_segMan, argv[1], SELECTOR(data));
- // New subops in SCI2.1 late / SCI3
- case 10: // unknown
- warning("kArray, subop %d", op);
- return NULL_REG;
- case 11: // unknown
- warning("kArray, subop %d", op);
- return NULL_REG;
default:
error("Unknown kArray subop %d", op);
}