[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.423,1.424
Max Horn
fingolfin at users.sourceforge.net
Sun Apr 10 10:20:40 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gob draw.cpp,1.6,1.7 game.cpp,1.12,1.13 gob.h,1.2,1.3 goblin.cpp,1.10,1.11 inter.cpp,1.9,1.10 mult.cpp,1.7,1.8 parse.cpp,1.4,1.5 scenery.cpp,1.8,1.9
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.312,1.313
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11654
Modified Files:
scumm.cpp
Log Message:
Fix for bug #1167146 (properly fix the monkey vs. monkey1 issue by using the substResFileNameTable table)
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -d -r1.423 -r1.424
--- scumm.cpp 10 Apr 2005 16:54:16 -0000 1.423
+++ scumm.cpp 10 Apr 2005 17:20:24 -0000 1.424
@@ -502,6 +502,7 @@
{ "00.LFL", "Maniac Mansion (F).prg", kGenAsIs },
{ "00.LFL", "Maniac Mansion (SW).prg", kGenAsIs },
{ "00.LFL", "Maniac Mansion (U).prg", kGenAsIs },
+ { "monkey", "monkey1", kGenPC},
{ "racedemo", "500demo", kGenPC},
{ "Spydemo", "foxdemo", kGenPC},
{ "Spydemo", "FoxDemo", kGenMac },
@@ -2407,19 +2408,6 @@
const char *target = elem->target;
- // HACK to work around bug #1009344
- if (!strcmp(target, "monkey")) {
- const char *str = name;
- int len = 0;
- // Scan to the end of the string...
- while (*str++)
- len++;
- // ...so that we can check if it ends with 'monkey1.000'
- const char *monkey1 = "monkey1.000"; // Len: 11
- if (len >= 11 && !scumm_stricmp(str-11-1, monkey1))
- target = "monkey1";
- }
-
// Find the GameSettings for that target
for (g = scumm_settings; g->name; ++g) {
if (0 == scumm_stricmp(g->name, target))
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gob draw.cpp,1.6,1.7 game.cpp,1.12,1.13 gob.h,1.2,1.3 goblin.cpp,1.10,1.11 inter.cpp,1.9,1.10 mult.cpp,1.7,1.8 parse.cpp,1.4,1.5 scenery.cpp,1.8,1.9
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.312,1.313
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list