[Scummvm-cvs-logs] CVS: scummex blocks.h,1.16,1.17 resource.h,1.25,1.26

[Jonathan Gray]

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

Modified Files:
	blocks.h resource.h 
Log Message:
compile fix/add blocks to blocks.h

Index: blocks.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/blocks.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- blocks.h	26 Jun 2004 05:31:55 -0000	1.16
+++ blocks.h	26 Jun 2004 07:10:45 -0000	1.17
@@ -173,11 +173,14 @@
 	IaCt,
 	REMP,
 	SANM,
-	SHDR,
 	Wave,
 	Bl16,
 	FLHD,
-	ANNO
+	ANNO,
+	ZFOB,
+	SMRK,
+	SHDR,
+	ETRS
 };
 
 enum {

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- resource.h	26 Jun 2004 06:33:37 -0000	1.25
+++ resource.h	26 Jun 2004 07:10:47 -0000	1.26
@@ -216,18 +216,17 @@
 	{149, "IaCt", "INSANE Action", 0, "", 24}, // small letters are intentional
 	{150, "REMP", "Actor Palette?", 0, "", 34},
 	{151, "SANM", "SMUSH v2 file", 0, "", 55},
-	{152, "SHDR", "SMUSH v2 header", 0, "", 55},
-	{153, "Wave", "SMUSH v2 VIMA audio codec", 0, "", 55},
-	{154, "Bl16", "SMUSH v2 Blocky16 video codec", 0, "", 55},
-	{155, "FLHD", "SMUSH v2 Frame Header", 0, "", 55},
-	{156, "ANNO", "SMUSH v2 Annotations", 0, "", 55}
-	{157, "ZFOB", "SMUSH Zlib Compressed Frame Object", 0, "", 32},
-	{158, "SMRK", "SMUSH Audio Marker", 0, "", 24},
-	{159, "SHDR", "SMUSH Audio Header", 0, "", 24},
-	{160, "ETRS", "SMUSH External Text Resource", 0, "", 24},
+	{152, "Wave", "SMUSH v2 VIMA audio codec", 0, "", 55},
+	{153, "Bl16", "SMUSH v2 Blocky16 video codec", 0, "", 55},
+	{154, "FLHD", "SMUSH v2 Frame Header", 0, "", 55},
+	{155, "ANNO", "SMUSH v2 Annotations", 0, "", 55},
+	{156, "ZFOB", "SMUSH Zlib Compressed Frame Object", 0, "", 32},
+	{157, "SMRK", "SMUSH Audio Marker", 0, "", 24},
+	{158, "SHDR", "SMUSH Audio Header", 0, "", 24},
+	{159, "ETRS", "SMUSH External Text Resource", 0, "", 24}
 };
 
-const int numBlocks = 161;
+const int numBlocks = 160;
 
 const struct blockInfo oldBlocksInfo[] = {
 	{200, "0R", "Directory of Rooms", 0, "", 18},