[Scummvm-cvs-logs] CVS: scummex blocks.h,1.5,1.6 resource.cpp,1.15,1.16 resource.h,1.9,1.10

[Adrien Mercier]

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

Modified Files:
	blocks.h resource.cpp resource.h 
Log Message:
Added two SMUSH blocks

Index: blocks.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/blocks.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- blocks.h	21 Sep 2003 15:04:14 -0000	1.5
+++ blocks.h	24 Sep 2003 12:38:45 -0000	1.6
@@ -133,7 +133,9 @@
 	XPAL,
 	ADL,
 	SPK,
-	ROL
+	ROL,
+	FTCH,
+	STOR
 };
 
 enum {

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- resource.cpp	23 Sep 2003 00:47:23 -0000	1.15
+++ resource.cpp	24 Sep 2003 12:38:45 -0000	1.16
@@ -657,6 +657,8 @@
 		case XPAL:
 		case ADL:
 		case ROL:
+		case FTCH:
+		case STOR:
 			_blockTable[index].blockSize = _input.readUint32BE() + 8;
 			_input.seek(_blockTable[index].offset + _blockTable[index].blockSize, SEEK_SET);
 			_gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
@@ -847,7 +849,7 @@
 
 int Resource::getBlockType(char *tag) {
 	
-	for (int i=0; i<113; i++) {
+	for (int i=0; i<115; i++) {
 		if(strstr(tag, blocksInfo[i].name)) {
 			return blocksInfo[i].id;
 		}

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- resource.h	23 Sep 2003 09:05:47 -0000	1.9
+++ resource.h	24 Sep 2003 12:38:45 -0000	1.10
@@ -174,7 +174,9 @@
 	{109, "XPAL", "", 0, "", 34},
 	{110, "ADL ", "", 1, "help/specADL.html", 31},
 	{111, "SPK ", "", 1, "help/specSPK.html", 31},
-	{112, "ROL ", "", 1, "help/specROL.html", 31}
+	{112, "ROL ", "", 1, "help/specROL.html", 31},
+	{113, "FTCH", "", 0, "", 47},
+	{114, "STOR", "", 0, "", 47}
 };
 
 const struct blockInfo oldBlocksInfo[] = {