[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.115,1.116

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27908

Modified Files:
	dialogs.cpp 
Log Message:
Fixing some  evil behaviour

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- dialogs.cpp	20 Jul 2004 11:50:43 -0000	1.115
+++ dialogs.cpp	27 Nov 2004 13:10:30 -0000	1.116
@@ -147,6 +147,7 @@
 
 
 const Common::String ScummDialog::queryResString(int stringno) {
+	byte buf[256];
 	byte *result;
 
 	if (stringno == 0)
@@ -163,11 +164,8 @@
 		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 :)