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

[Jonathan Gray]

Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1:/tmp/cvs-serv5841

Modified Files:
	blocks.h resource.cpp resource.h wxwindows.cpp 
Log Message:
even more...

Index: blocks.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/blocks.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- blocks.h	29 Sep 2003 10:04:01 -0000	1.10
+++ blocks.h	29 Sep 2003 10:58:20 -0000	1.11
@@ -159,7 +159,16 @@
 	SGHD,
 	SGEN,
 	DIGI,
-	RMDA
+	RMDA,
+	BMAP,
+	WIZH,
+	AWIZ,
+	WIZD,
+	SPOT,
+	CNVS,
+	POLD,
+	LSC2,
+	FMUS
 };
 
 enum {

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- resource.cpp	29 Sep 2003 10:04:01 -0000	1.22
+++ resource.cpp	29 Sep 2003 10:58:20 -0000	1.23
@@ -576,6 +576,8 @@
 		case TLKB:
 		case TALK:
 		case SONG:
+		case DIGI:
+		case RMDA:
 			_blockTable[index].blockSize = _input.readUint32BE();
 			_gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
 			bufindex = index;

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- resource.h	29 Sep 2003 10:04:01 -0000	1.15
+++ resource.h	29 Sep 2003 10:58:20 -0000	1.16
@@ -186,24 +186,34 @@
 	{120, "WVhd", "", 0, "", 31},
 	{121, "AUdt", "", 0, "", 31},
 	{122, "WVdt", "", 0, "", 31},
-	{123, "TLKB", "", 0, "", 47},
-	{124, "TALK", "", 0, "", 47},
-	{125, "HSHD", "", 0, "", 47},
+	{123, "TLKB", "Talkie ?", 0, "", 47},
+	{124, "TALK", "Talkie Sounds", 0, "", 47},
+	{125, "HSHD", "Humongous Sound HeaDer", 0, "", 47},
 	{126, "DIRI", "", 0, "", 47},
-	{127, "DIRR", "", 0, "", 47},
-	{128, "DIRN", "", 0, "", 47},
-	{129, "DIRC", "", 0, "", 47},
-	{130, "DIRM", "", 0, "", 47},
-	{131, "DLFL", "", 0, "", 47},
-	{132, "DIRS", "", 0, "", 47},
-	{133, "SONG", "", 0, "", 47},
-	{134, "SGHD", "", 0, "", 47},
-	{135, "SGEN", "", 0, "", 47},
-	{136, "DIGI", "", 0, "", 47},
-	{137, "RMDA", "", 0, "", 47}
+	{127, "DIRR", "Directory of Rooms", 0, "", 47},
+	{128, "DIRN", "Directory of Sounds", 0, "", 47},
+	{129, "DIRC", "Directory of Costumes", 0, "", 47},
+	{130, "DIRF", "Directory of Charsets", 0, "", 47},
+	{131, "DIRM", "", 0, "", 47},
+	{132, "DLFL", "Directory of LFLs", 0, "", 47},
+	{133, "DIRS", "", 0, "", 47},
+	{134, "SONG", "", 0, "", 47},
+	{135, "SGHD", "Song Header", 0, "", 47},
+	{136, "SGEN", "Song ?", 0, "", 47},
+	{137, "DIGI", "Digital Sound", 0, "", 47},
+	{138, "RMDA", "Room Data", 0, "", 47},
+	{139, "BMAP", "Bitmap Image", 0, "", 47},
+	{140, "WIZH", "", 0, "", 47},
+	{141, "AWIZ", "", 0, "", 47},
+	{142, "WIZD", "", 0, "", 47},
+	{143, "SPOT", "", 0, "", 47},
+	{144, "CNVS", "", 0, "", 47},
+	{145, "POLD", "", 0, "", 47},
+	{146, "LSC2", "", 0, "", 47},
+	{147, "FMUS", "Music header?", 0, "", 47}
 };
 
-const int numBlocks = 138;
+const int numBlocks = 148;
 
 const struct blockInfo oldBlocksInfo[] = {
 	{200, "0R", "Directory of Rooms", 0, "", 18},

Index: wxwindows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- wxwindows.cpp	28 Sep 2003 21:49:25 -0000	1.30
+++ wxwindows.cpp	29 Sep 2003 10:58:20 -0000	1.31
@@ -1182,22 +1182,27 @@
 			break;
 			
 		case DROO:
+		case DIRR:
 			bigIconBitmap = wxBitmap(xpm_18_big);
 			break;
 			
 		case DSCR:
+		case DIRS:
 			bigIconBitmap = wxBitmap(xpm_19_big);
 			break;
 			
 		case DSOU:
+		case DIRN:
 			bigIconBitmap = wxBitmap(xpm_20_big);
 			break;
 			
 		case DCOS:
+		case DIRC:
 			bigIconBitmap = wxBitmap(xpm_14_big);
 			break;
 			
 		case DCHR:
+		case DIRF:
 			bigIconBitmap = wxBitmap(xpm_13_big);
 			break;