[Scummvm-cvs-logs] CVS: scummvm-new/scumm/smush player.cpp,1.5,1.6 frenderer.cpp,1.2,1.3
Ruediger Hanke
tomjoad at users.sourceforge.net
Sun Aug 25 13:11:01 CEST 2002
Update of /cvsroot/scummvm/scummvm-new/scumm/smush
In directory usw-pr-cvs1:/tmp/cvs-serv14978
Modified Files:
player.cpp frenderer.cpp
Log Message:
Fixing subtitles for German dig - TRES file is unencrypted in German version
Index: player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/player.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- player.cpp 25 Aug 2002 17:36:34 -0000 1.5
+++ player.cpp 25 Aug 2002 20:10:01 -0000 1.6
@@ -617,7 +617,10 @@
static const int ETRS_HEADER_LENGTH = 16;
assert(length > ETRS_HEADER_LENGTH);
Chunk::type type = READ_BE_UINT32(filebuffer);
- if(type != TYPE_ETRS) error("invalid type for file"); // mem leak !!!
+ if(type != TYPE_ETRS) {
+ delete [] filebuffer;
+ return getStrings(file, false);
+ }
char * old = filebuffer;
filebuffer = new char[length - ETRS_HEADER_LENGTH];
for(int i = ETRS_HEADER_LENGTH; i < length; i++)
Index: frenderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/frenderer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- frenderer.cpp 25 Aug 2002 10:50:18 -0000 1.2
+++ frenderer.cpp 25 Aug 2002 20:10:01 -0000 1.3
@@ -173,6 +173,7 @@
int * substr_widths = new int[nb_sub];
int space_width = charWidth(' ');
+ i = 0;
while(i < nb_sub) {
int substr_width = sizes[i];
char * substr = new char[1000];
More information about the Scummvm-git-logs
mailing list