[Scummvm-cvs-logs] CVS: scummvm-new/scumm/smush player.cpp,1.6,1.7

[Ruediger Hanke]

Update of /cvsroot/scummvm/scummvm-new/scumm/smush
In directory usw-pr-cvs1:/tmp/cvs-serv11225

Modified Files:
	player.cpp 
Log Message:
German FT TRES file has a multiline string which caused an assertion failure

Index: player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/player.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- player.cpp	25 Aug 2002 20:10:01 -0000	1.6
+++ player.cpp	25 Aug 2002 22:25:18 -0000	1.7
@@ -105,6 +105,19 @@
 			assert(value);
 			memcpy(value, data_start, data_end - data_start);
 			value[data_end - data_start] = 0;
+			char * line_start = value;
+			char * line_end;
+			while (line_end = strchr(line_start, '\n')) {
+				line_start = line_end+1;
+				if (line_start[0] == '/' && line_start[1] == '/') {
+					line_start += 2;
+					if	(line_end[-1] == '\r')
+						line_end[-1] = ' ';
+					else
+						*line_end++ = ' ';
+					memmove(line_end, line_start, strlen(line_start)+1);
+				}
+			}
 #ifdef DEBUG
 			debug(9, "Inserting (%s)%d == \"%s\"", idstring, id, value);
 #endif