aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2004-11-27 13:10:30 +0000
committerMax Horn2004-11-27 13:10:30 +0000
commit6bcb1ce7d9015772fabeb8a764aa901b099d5686 (patch)
treec820296b8d04d7e955f45b3b30ffbf04f941a66a /scumm
parentfe43ebf73b31a6a831b40a91d216dd84fe9599b7 (diff)
downloadscummvm-rg350-6bcb1ce7d9015772fabeb8a764aa901b099d5686.tar.gz
scummvm-rg350-6bcb1ce7d9015772fabeb8a764aa901b099d5686.tar.bz2
scummvm-rg350-6bcb1ce7d9015772fabeb8a764aa901b099d5686.zip
Fixing some evil behaviour
svn-id: r15907
Diffstat (limited to 'scumm')
-rw-r--r--scumm/dialogs.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index c401ccec13..26ad9f8cf8 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -147,6 +147,7 @@ static ResString string_map_table_v5[] = {
const Common::String ScummDialog::queryResString(int stringno) {
+ byte buf[256];
byte *result;
if (stringno == 0)
@@ -163,11 +164,8 @@ const Common::String ScummDialog::queryResString(int stringno) {
return string_map_table_v5[stringno - 1].string;
if (result && *result == '/') {
- byte tmp[256];
- _vm->translateText(result, tmp);
-
- // FIXME: AARGH! We shouldn't just strcpy into the data we got from getStringAddress
- strcpy((char *)result, (char *)tmp);
+ _vm->translateText(result, buf);
+ result = buf;
}
if (!result || *result == '\0') { // Gracelessly degrade to english :)