[Scummvm-cvs-logs] CVS: tools queenrebuild.c,1.3,1.4 README,1.9,1.10

[Joost Peters]

Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv20825

Modified Files:
	queenrebuild.c README 
Log Message:
add support for spanish cd version + tiny update to the README

Index: queenrebuild.c
===================================================================
RCS file: /cvsroot/scummvm/tools/queenrebuild.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- queenrebuild.c	28 Oct 2003 13:50:31 -0000	1.3
+++ queenrebuild.c	30 Oct 2003 23:43:23 -0000	1.4
@@ -62,8 +62,11 @@
 	VER_GER_TALKIE   = 5,
 	VER_ITA_FLOPPY   = 6,
 	VER_ITA_TALKIE   = 7,
-	VER_DEMO_PCGAMES = 8,
-	VER_DEMO         = 9
+	VER_SPA_TALKIE   = 8,
+	VER_DEMO_PCGAMES = 9,
+	VER_DEMO         = 10,
+
+	VER_NUMBER       = 11
 };
 
 struct GameVersion {
@@ -71,6 +74,7 @@
         uint8 isFloppy;
         uint8 isDemo;
         uint32 tableOffset;
+	uint32 dataFileSize;
 };
 
 struct {
@@ -87,18 +91,20 @@
 
 
 const struct GameVersion gameVersions[] = {
-        { "PEM10", 1, 0, 0x00000008 },
-        { "CEM10", 0, 0, 0x0000584E },
-        { "PFM10", 1, 0, 0x0002CD93 },
-        { "CFM10", 0, 0, 0x00032585 },
-        { "PGM10", 1, 0, 0x00059ACA },
-        { "CGM10", 0, 0, 0x0005F2A7 },
-        { "PIM10", 1, 0, 0x000866B1 },
-        { "CIM10", 0, 0, 0x0008BEE2 },
-        { "PE100", 1, 1,  0x000B343C },
-        { "PE100", 1, 1,  0x000B40F5 }
+        { "PEM10", 1, 0, 0x00000008,  22677657 },
+        { "CEM10", 0, 0, 0x0000584E, 190787021 },
+        { "PFM10", 1, 0, 0x0002CD93,  22157304 },
+        { "CFM10", 0, 0, 0x00032585, 186689095 },
+        { "PGM10", 1, 0, 0x00059ACA,  22240013 },
+        { "CGM10", 0, 0, 0x0005F2A7, 217648975 },
+        { "PIM10", 1, 0, 0x000866B1,  22461366 },
+        { "CIM10", 0, 0, 0x0008BEE2, 190795582 },
+	{ "CSM10", 0, 0, 0x000B343C, 190730602 },
+        { "PE100", 1, 1, 0x000DA981,   3724538 },
+        { "PE100", 1, 1, 0x000DB63A,   3732177 }
 };
 
+
 const struct GameVersion *version;
 
 
@@ -114,41 +120,16 @@
 }
 
 const struct GameVersion *detectGameVersion(uint32 size) {
-	switch(size) {
-		case 3724538:
-			return &gameVersions[VER_DEMO_PCGAMES];
-			break;
-		case 3732177:
-			return &gameVersions[VER_DEMO];
-			break;
-		case 22677657:
-			return &gameVersions[VER_ENG_FLOPPY];
-			break;
-		case 190787021:
-			return &gameVersions[VER_ENG_TALKIE];
-			break;
-		case 22157304: 
-			return &gameVersions[VER_FRE_FLOPPY];
-			break;
-		case 186689095:
-			return &gameVersions[VER_FRE_TALKIE];
-			break;
-		case 22240013: 
-			return &gameVersions[VER_GER_FLOPPY];
-			break;
-		case 217648975: 
-			return &gameVersions[VER_GER_TALKIE];
-			break;
-		case 22461366:
-			return &gameVersions[VER_ITA_FLOPPY];
-			break;
-		case 190795582: 
-			return &gameVersions[VER_ITA_TALKIE];
-			break;
-		default:
-			printf("Unknown/unsupported version of FOTAQ!");
-			exit(1);
-	}
+	const struct GameVersion *pgv = gameVersions;
+	int i;
+	for (i = 0; i < VER_NUMBER; ++i, ++pgv) {
+		if (pgv->dataFileSize == size) {
+			return pgv;
+		}
+ 	}
+	printf("Unknown/unsupported FOTAQ version!\n");
+	exit(1);
+	return NULL;
 }
 
 uint8 readByte(FILE *fp) {

Index: README
===================================================================
RCS file: /cvsroot/scummvm/tools/README,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- README	20 Oct 2003 23:26:39 -0000	1.9
+++ README	30 Oct 2003 23:43:23 -0000	1.10
@@ -15,7 +15,7 @@
         descumm - Decompiles SCUMM scripts
 
         queenrebuild - Used to rebuild the datafile of Flight of the Amazon
-                       Queen, allows for MP3 compression. 
+                       Queen, allows for optional MP3/Ogg compression. 
 
         simon1decr - Used to decrunch the graphics and music files in AGA/ECS 
                          versions of Simon the Sorcerer 1 for Amiga