[Scummvm-cvs-logs] CVS: scummex blocks.h,1.11,1.12 resource.cpp,1.24,1.25 resource.h,1.17,1.18

Adrien Mercier yoshizf at users.sourceforge.net
Tue Sep 30 05:29:13 CEST 2003


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

Modified Files:
	blocks.h resource.cpp resource.h 
Log Message:
Added some v3 sound blocks

Index: blocks.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/blocks.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- blocks.h	29 Sep 2003 10:58:20 -0000	1.11
+++ blocks.h	30 Sep 2003 12:28:33 -0000	1.12
@@ -199,6 +199,8 @@
 	SP,
 	SA,
 	SO,
-	RN
+	RN,
+	WA,
+	AD
 };
 

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- resource.cpp	30 Sep 2003 11:41:28 -0000	1.24
+++ resource.cpp	30 Sep 2003 12:28:33 -0000	1.25
@@ -825,6 +825,7 @@
 			break;
 
 		case LE:
+		case SO:
 			_gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
 			bufindex = index;
 			index++;
@@ -882,8 +883,8 @@
 
 int Resource::getBlockType(char *tag) {
 	
-	for (int i=0; i< numBlocks; i++) {
-		if(strstr(tag, blocksInfo[i].name)) {
+	for (int i = 0; i < numBlocks; i++) {
+		if(strncmp(tag, blocksInfo[i].name, 4) == 0) {
 			return blocksInfo[i].id;
 		}
 
@@ -895,11 +896,12 @@
 
 int Resource::getOldBlockType(char *tag) {
 	
-	for (int i=0; i<28; i++) {
-		if(strstr(tag, oldBlocksInfo[i].name)) {
+	for (int i = 0; i < numOldBlocks; i++) {
+		if(strncmp(tag, oldBlocksInfo[i].name, 2) == 0) {
 			return oldBlocksInfo[i].id;
 		}
 	}
+	printf("Unknown block: %s\n", tag);
 	return -1;
 }
 

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- resource.h	30 Sep 2003 00:38:43 -0000	1.17
+++ resource.h	30 Sep 2003 12:28:33 -0000	1.18
@@ -243,8 +243,12 @@
 	{224, "SP", "", 0, "", 47},
 	{225, "SA", "", 0, "", 40},
 	{226, "SO", "", 0, "", 59},
-	{227, "RN", "", 0, "", 47}
+	{227, "RN", "", 0, "", 47},
+	{228, "WA", "", 0, "", 31},
+	{229, "AD", "", 0, "", 31}
 };
+
+const int numOldBlocks = 30;
 
 class Resource {
 private:





More information about the Scummvm-git-logs mailing list