[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.603.2.17,1.603.2.18
Eugene Sandulenko
sev at users.sourceforge.net
Fri Oct 28 12:00:22 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5534
Modified Files:
Tag: branch-0-8-0
scumm.cpp
Log Message:
Add dummy entry at end of substResFileNameTable[] and use that like in other
tables. Fixes crash on PSP
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.603.2.17
retrieving revision 1.603.2.18
diff -u -d -r1.603.2.17 -r1.603.2.18
--- scumm.cpp 28 Oct 2005 11:42:48 -0000 1.603.2.17
+++ scumm.cpp 28 Oct 2005 18:57:50 -0000 1.603.2.18
@@ -846,6 +846,7 @@
{ "thinkerk", "ThinkerK", kGenMac },
{ "water", "Water Worries", kGenMac },
#endif
+ { NULL, NULL, 0 }
};
static int compareMD5Table(const void *a, const void *b) {
@@ -3025,7 +3026,7 @@
ext = strrchr(filename, '.');
size_t len = (ext != NULL) ? ext - filename : strlen(filename);
- for (int i = index; i < ARRAYSIZE(substResFileNameTable); i++) {
+ for (int i = index; substResFileNameTable[i].winName; i++) {
if (!scumm_strnicmp(filename, substResFileNameTable[i].winName, len)) {
switch (substResFileNameTable[i].genMethod) {
case kGenMac:
More information about the Scummvm-git-logs
mailing list