aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2016-01-15 02:46:35 +0200
committerFilippos Karapetis2016-01-15 02:46:35 +0200
commitfbc9fe03c089d4d5d344370460b7c7ad3afc38be (patch)
treea6f23d2318d2efa86c871a032960d516a6390f89
parent1d2abb4c9e616b6803ec03d317fe972021bbbdec (diff)
downloadscummvm-rg350-fbc9fe03c089d4d5d344370460b7c7ad3afc38be.tar.gz
scummvm-rg350-fbc9fe03c089d4d5d344370460b7c7ad3afc38be.tar.bz2
scummvm-rg350-fbc9fe03c089d4d5d344370460b7c7ad3afc38be.zip
SCI: Allow null references to kStringGetData, for Torin's Passage
Added a TODO for rhis, for now
-rw-r--r--engines/sci/engine/kernel_tables.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h
index b1df235cb0..2d0f1c3933 100644
--- a/engines/sci/engine/kernel_tables.h
+++ b/engines/sci/engine/kernel_tables.h
@@ -324,7 +324,9 @@ static const SciKernelMapSubEntry kString_subops[] = {
// =SCI2, SCI2.1 Early and SCI2.1 Middle=
{ SIG_UNTIL_SCI21MID, 8, MAP_CALL(StringDup), "[or]", NULL },
- { SIG_UNTIL_SCI21MID, 9, MAP_CALL(StringGetData), "[or]", NULL },
+ // TODO: This gets called with null references in Torin. Check if this is correct, or it's
+ // caused by missing functionality
+ { SIG_UNTIL_SCI21MID, 9, MAP_CALL(StringGetData), "[or0]", NULL },
{ SIG_UNTIL_SCI21MID, 10, MAP_CALL(StringLen), "[or]", NULL },
{ SIG_UNTIL_SCI21MID, 11, MAP_CALL(StringPrintf), "[or](.*)", NULL },
{ SIG_UNTIL_SCI21MID, 12, MAP_CALL(StringPrintfBuf), "[or](.*)", NULL },