[Scummvm-cvs-logs] CVS: scummvm/scumm instrument.cpp,2.36.2.1,2.36.2.2 scumm.cpp,1.603.2.28,1.603.2.29
kirben
kirben at users.sourceforge.net
Sat Jan 14 01:36:05 CET 2006
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm help.cpp,1.25,1.26 scumm.cpp,1.687,1.688 sound.cpp,1.498,1.499 vars.cpp,1.159,1.160 scumm.h,1.663,1.664
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm-md5.h,2.157,2.158
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23889/scumm
Modified Files:
Tag: branch-0-8-0
instrument.cpp scumm.cpp
Log Message:
Backport fix for detection of Maniac Mansion V1 demo.
Index: instrument.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/instrument.cpp,v
retrieving revision 2.36.2.1
retrieving revision 2.36.2.2
diff -u -d -r2.36.2.1 -r2.36.2.2
--- instrument.cpp 18 Oct 2005 02:11:21 -0000 2.36.2.1
+++ instrument.cpp 14 Jan 2006 09:35:46 -0000 2.36.2.2
@@ -393,7 +393,7 @@
memcpy (&_instrument_name, &_instrument.common.name, sizeof (_instrument.common.name));
_instrument_name[10] = '\0';
if (!_native_mt32 && getEquivalentGM() >= 128) {
- warning ("MT-32 instrument \"%s\" not supported yet", _instrument_name);
+ debug(0, "MT-32 instrument \"%s\" not supported yet", _instrument_name);
_instrument_name[0] = '\0';
}
}
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.603.2.28
retrieving revision 1.603.2.29
diff -u -d -r1.603.2.28 -r1.603.2.29
--- scumm.cpp 13 Jan 2006 05:30:57 -0000 1.603.2.28
+++ scumm.cpp 14 Jan 2006 09:35:46 -0000 1.603.2.29
@@ -2819,7 +2819,7 @@
detectName[0] = '\0';
// TODO: we need to add cache here
- for (int method = 0; method < 7; method++) {
+ for (int method = 0; method < 8; method++) {
switch (method) {
case 0:
strcpy(detectName, "00.LFL");
@@ -2846,6 +2846,9 @@
strcpy(detectName, base);
strcat(detectName, ".sm0");
break;
+ case 7:
+ strcpy(detectName, "00.MAN");
+ break;
}
strcpy(tempName, detectName);
@@ -3159,30 +3162,33 @@
int substLastIndex = 0;
bool found = false;
- for (int method = 0; method < 6 && !found; method++) {
+ for (int method = 0; method < 7 && !found; method++) {
switch (method) {
case 0:
- strcpy(detectName, name);
- strcat(detectName, ".000");
+ strcpy(detectName, "00.LFL");
break;
case 1:
- strcpy(detectName, "00.LFL");
+ strcpy(detectName, "000.LFL");
break;
case 2:
- strcpy(detectName, "000.LFL");
+ strcpy(detectName, name);
+ strcat(detectName, ".la0");
break;
case 3:
strcpy(detectName, name);
- strcat(detectName, ".la0");
+ strcat(detectName, ".he0");
break;
case 4:
strcpy(detectName, name);
- strcat(detectName, ".he0");
+ strcat(detectName, ".000");
break;
case 5:
strcpy(detectName, name);
strcat(detectName, ".sm0");
break;
+ case 6:
+ strcpy(detectName, "00.MAN");
+ break;
}
strcpy(tempName, detectName);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm help.cpp,1.25,1.26 scumm.cpp,1.687,1.688 sound.cpp,1.498,1.499 vars.cpp,1.159,1.160 scumm.h,1.663,1.664
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm-md5.h,2.157,2.158
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list