[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.686,1.687

kirben kirben at users.sourceforge.net
Sat Jan 14 00:52:01 CET 2006


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16793/scumm

Modified Files:
	scumm.cpp 
Log Message:

Fix detection of Maniac Mansion V1 demo.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.686
retrieving revision 1.687
diff -u -d -r1.686 -r1.687
--- scumm.cpp	14 Jan 2006 05:32:11 -0000	1.686
+++ scumm.cpp	14 Jan 2006 08:51:22 -0000	1.687
@@ -2861,7 +2861,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");
@@ -2888,6 +2888,9 @@
 				strcpy(detectName, base);
 				strcat(detectName, ".sm0");
 				break;
+			case 7:
+				strcpy(detectName, "00.MAN");
+				break;
 			}
 			strcpy(tempName, detectName);
 
@@ -3201,30 +3204,33 @@
 
 	ScummGameSettings game = *g;
 
-	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);
 





More information about the Scummvm-git-logs mailing list