[Scummvm-cvs-logs] CVS: scummex blocks.h,1.8,1.9 resource.cpp,1.20,1.21 resource.h,1.13,1.14

Jonathan Gray khalek at users.sourceforge.net
Mon Sep 29 04:01:07 CEST 2003


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

Modified Files:
	blocks.h resource.cpp resource.h 
Log Message:
add some humongous blocks

Index: blocks.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/blocks.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- blocks.h	28 Sep 2003 21:49:25 -0000	1.8
+++ blocks.h	29 Sep 2003 09:43:18 -0000	1.9
@@ -143,7 +143,18 @@
 	AUhd,
 	WVhd,
 	AUdt,
-	WVdt
+	WVdt,
+	TLKB,
+	TALK,
+	HSHD,
+	DIRI,
+	DIRR,
+	DIRN,
+	DIRC,
+	DIRF,
+	DIRM,
+	DLFL,
+	DIRS
 };
 
 enum {

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- resource.cpp	28 Sep 2003 21:49:25 -0000	1.20
+++ resource.cpp	29 Sep 2003 09:43:18 -0000	1.21
@@ -573,6 +573,8 @@
 		case SOUN:
 		case ZPLN:
 		case SBL:
+		case TLKB:
+		case TALK:
 			_blockTable[index].blockSize = _input.readUint32BE();
 			_gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
 			bufindex = index;
@@ -859,7 +861,7 @@
 
 int Resource::getBlockType(char *tag) {
 	
-	for (int i=0; i<123; i++) {
+	for (int i=0; i< numBlocks; 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.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- resource.h	28 Sep 2003 21:49:25 -0000	1.13
+++ resource.h	29 Sep 2003 09:43:18 -0000	1.14
@@ -185,8 +185,20 @@
 	{119, "AUhd", "", 0, "", 31},
 	{120, "WVhd", "", 0, "", 31},
 	{121, "AUdt", "", 0, "", 31},
-	{122, "WVdt", "", 0, "", 31}
+	{122, "WVdt", "", 0, "", 31},
+	{123, "TLKB", "", 0, "", 47},
+	{124, "TALK", "", 0, "", 47},
+	{125, "HSHD", "", 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}
 };
+
+const int numBlocks = 133;
 
 const struct blockInfo oldBlocksInfo[] = {
 	{200, "0R", "Directory of Rooms", 0, "", 18},





More information about the Scummvm-git-logs mailing list