aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kstring.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2010-02-07 04:25:05 +0000
committerMatthew Hoops2010-02-07 04:25:05 +0000
commit9183ab57a3c260fda721b4eb3103f707be0ea16a (patch)
treefdbe0b842fc6632b92a7069577e4a7db48676173 /engines/sci/engine/kstring.cpp
parent71c222e340a11c999c0fcfc7536bd43c60aa01be (diff)
downloadscummvm-rg350-9183ab57a3c260fda721b4eb3103f707be0ea16a.tar.gz
scummvm-rg350-9183ab57a3c260fda721b4eb3103f707be0ea16a.tar.bz2
scummvm-rg350-9183ab57a3c260fda721b4eb3103f707be0ea16a.zip
SCI1 Mac games can call kGetFarText with a NULL destination, so we need to allocate the memory. King's Quest V Mac is now playable.
svn-id: r47950
Diffstat (limited to 'engines/sci/engine/kstring.cpp')
-rw-r--r--engines/sci/engine/kstring.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index c11e7fc28b..f3662da6fe 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -424,23 +424,26 @@ reg_t kGetFarText(EngineState *s, int argc, reg_t *argv) {
char *seeker;
int counter = argv[1].toUint16();
-
if (!textres) {
error("text.%d does not exist", argv[0].toUint16());
return NULL_REG;
}
- seeker = (char *) textres->data;
-
+ seeker = (char *)textres->data;
+
+ // The second parameter (counter) determines the number of the string inside the text
+ // resource.
while (counter--) {
while (*seeker++)
;
}
- /* The second parameter (counter) determines the number of the string inside the text
- ** resource.
- */
- s->_segMan->strcpy(argv[2], seeker); /* Copy the string and get return value */
+ // If the third argument is NULL, allocate memory for the destination. This occurs in
+ // SCI1 Mac games. The memory will later be freed by the game's scripts.
+ if (argv[2] == NULL_REG)
+ s->_segMan->allocDynmem(strlen(seeker) + 1, "Mac FarText", &argv[2]);
+
+ s->_segMan->strcpy(argv[2], seeker); // Copy the string and get return value
return argv[2];
}