[Scummvm-cvs-logs] CVS: scummvm/queen resource.cpp,1.42,1.43 resource.h,1.34,1.35

Joost Peters joostp at users.sourceforge.net
Wed Feb 11 13:13:05 CET 2004


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

Modified Files:
	resource.cpp resource.h 
Log Message:
add support for the hebrew talkie version and warn the user if s/he's using an old version of the tbl file


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- resource.cpp	23 Jan 2004 16:57:52 -0000	1.42
+++ resource.cpp	11 Feb 2004 21:07:39 -0000	1.43
@@ -37,9 +37,10 @@
 	{ "PIM10", 0x000866B1,  22461366 },
 	{ "CIM10", 0x0008BEE2, 190795582 },
 	{ "CSM10", 0x000B343C, 190730602 },
-	{ "PE100", 0x000DA981,   3724538 },
-	{ "PE100", 0x000DB63A,   3732177 },
-	{ "PEint", 0x000DC2F3,   1915913 }
+	{ "CHM10", 0x000DA981, 190705558 },
+	{ "PE100", 0x00101EC6,   3724538 },
+	{ "PE100", 0x00102B7F,   3732177 },
+	{ "PEint", 0x00103838,   1915913 }
 };
 
 
@@ -187,6 +188,8 @@
 		return ITALIAN;
 	case 'S':
 		return SPANISH;
+	case 'H':
+		return HEBREW;
 	default:
 		return ENGLISH;
 	}
@@ -198,6 +201,8 @@
 	if (!tableFile.isOpen())	
 		tableFile.open(_tableFilename, ""); // try current directory
 	if (tableFile.isOpen() && tableFile.readUint32BE() == 'QTBL') {
+		if (tableFile.readUint32BE() != CURRENT_TBL_VERSION)
+			warning("Incorrect version of queen.tbl, please update it");
 		tableFile.seek(gameVersion->tableOffset);
 		readTableEntries(&tableFile);
 		return true;

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- resource.h	19 Jan 2004 22:31:21 -0000	1.34
+++ resource.h	11 Feb 2004 21:07:39 -0000	1.35
@@ -40,14 +40,16 @@
 	// VER_SPA_FLOPPY
 	VER_SPA_TALKIE   = 8,
 	// VER_HEB_FLOPPY
-	// VER_HEB_TALKIE
-	VER_DEMO_PCGAMES = 9,
-	VER_DEMO         = 10,
-	VER_INTERVIEW    = 11,
+	VER_HEB_TALKIE	 = 9,
+	VER_DEMO_PCGAMES = 10,
+	VER_DEMO         = 11,
+	VER_INTERVIEW    = 12,
 
-	VER_COUNT        = 12
+	VER_COUNT        = 13
 };
 
+enum { CURRENT_TBL_VERSION = 1 }; 
+
 struct ResourceEntry {
 	char filename[13];
 	uint8 bundle;
@@ -96,8 +98,8 @@
 
 	enum {
 		JAS_VERSION_OFFSET_DEMO = 0x119A8,
-		JAS_VERSION_OFFSET_INTV = 0xCF8,
-		JAS_VERSION_OFFSET	    = 0x12484
+		JAS_VERSION_OFFSET_INTV	= 0xCF8,
+		JAS_VERSION_OFFSET	= 0x12484
 	};
 
 protected:





More information about the Scummvm-git-logs mailing list