[Scummvm-cvs-logs] CVS: scummex blocks.h,1.15,1.16 resource.cpp,1.30,1.31 resource.h,1.23,1.24

[Jonathan Gray]

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

Modified Files:
	blocks.h resource.cpp resource.h 
Log Message:
attempt to make SANM smush files work but I don't get an expandable tree for whatever reason

Index: blocks.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/blocks.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- blocks.h	26 Jun 2004 03:30:01 -0000	1.15
+++ blocks.h	26 Jun 2004 05:31:55 -0000	1.16
@@ -171,7 +171,13 @@
 	FMUS,
 	SKIP,
 	IaCt,
-	REMP
+	REMP,
+	SANM,
+	SHDR,
+	Wave,
+	Bl16,
+	FLHD,
+	ANNO
 };
 
 enum {

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- resource.cpp	26 Jun 2004 03:30:01 -0000	1.30
+++ resource.cpp	26 Jun 2004 05:31:55 -0000	1.31
@@ -570,6 +570,7 @@
 		case RMSC:
 		case AKOS:
 		case ANIM:
+		case SANM:
 		case LECF:
 		case LFLF:
 		case ROOM:
@@ -678,6 +679,7 @@
 			break;
 			
 		case AHDR:
+		case SHDR:
 		case TRES:
 		case STRK:
 		case XPAL:

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- resource.h	26 Jun 2004 03:36:23 -0000	1.23
+++ resource.h	26 Jun 2004 05:31:55 -0000	1.24
@@ -214,10 +214,16 @@
 	{147, "FMUS", "Music header?", 0, "", 47},
 	{148, "SKIP", "SMUSH Skip", 0, "", 47},
 	{149, "IaCt", "INSANE Action", 0, "", 24}, // small letters are intentional
-	{150, "REMP", "Actor Palette?", 0, "", 34}
+	{150, "REMP", "Actor Palette?", 0, "", 34},
+	{151, "SANM", "SMUSH v2 file", 0, "", 55},
+	{152, "SHDR", "SMUSH v2 header", 0, "", 55},
+	{153, "Wave", "VIMA audio", 0, "", 55},
+	{154, "Bl16", "Blocky16 video", 0, "", 55},
+	{155, "FLHD", "", 0, "", 55},
+	{156, "ANNO", "", 0, "", 55}
 };
 
-const int numBlocks = 151;
+const int numBlocks = 157;
 
 const struct blockInfo oldBlocksInfo[] = {
 	{200, "0R", "Directory of Rooms", 0, "", 18},