[Scummvm-cvs-logs] CVS: scummex resource.cpp,1.1.1.1,1.2
Adrien Mercier
yoshizf at users.sourceforge.net
Thu Sep 18 11:16:08 CEST 2003
Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1:/tmp/cvs-serv25170
Modified Files:
resource.cpp
Log Message:
cleaned parseBlocks
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- resource.cpp 18 Sep 2003 16:26:55 -0000 1.1.1.1
+++ resource.cpp 18 Sep 2003 18:14:00 -0000 1.2
@@ -200,14 +200,6 @@
index++;
break;
- case LECF:
- _blockTable[index].blockSize = _input.readUint32BE();
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- index++;
- level++;
- index = searchBlocks(_blockTable, _input, index, level, _blockTable[index-1].blockSize + _blockTable[index-1].offset);
- break;
-
case LOFF:
_blockTable[index].blockSize = _input.readUint32BE();
numFiles = _input.readByte();
@@ -221,25 +213,6 @@
_gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
index++;
break;
-
- case LFLF:
- blockSize = _input.readUint32BE();
- _blockTable[index].blockSize = blockSize;
- blockOffset = _blockTable[index].offset;
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- index++;
- level++;
- index = searchBlocks(_blockTable, _input, index, level, blockSize + blockOffset);
- _input.seek(blockSize + blockOffset, SEEK_SET);
- break;
-
- case ROOM:
- _blockTable[index].blockSize = _input.readUint32BE();
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- index++;
- level++;
- index = searchBlocks(_blockTable, _input, index, level, _blockTable[index-1].blockSize + _blockTable[index-1].offset);
- break;
case RMHD:
_blockTable[index].blockSize = _input.readUint32BE();
@@ -272,24 +245,6 @@
index++;
break;
- case CYCL:
- case EPAL:
- case BOXD:
- case BOXM:
- _blockTable[index].blockSize = _input.readUint32BE();
- _input.seek(_blockTable[index].offset + _blockTable[index].blockSize, SEEK_SET);
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- index++;
- break;
-
- case OBCD:
- _blockTable[index].blockSize = _input.readUint32BE();
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- index++;
- level++;
- index = searchBlocks(_blockTable, _input, index, level, _blockTable[index-1].blockSize + _blockTable[index-1].offset);
- break;
-
case OBNA:
_blockTable[index].blockSize = _input.readUint32BE();
while (1) {
@@ -302,14 +257,6 @@
index++;
break;
- case CDHD:
- case VERB:
- _blockTable[index].blockSize = _input.readUint32BE();
- _input.seek(_blockTable[index].offset + _blockTable[index].blockSize, SEEK_SET);
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- index++;
- break;
-
case DROO:
case DSCR:
case DSOU:
@@ -349,24 +296,6 @@
index++;
break;
- case PALS:
- _blockTable[index].blockSize = _input.readUint32BE();
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- index++;
- level++;
- index = searchBlocks(_blockTable, _input, index, level, _blockTable[index-1].blockSize + _blockTable[index-1].offset);
- break;
-
- case WRAP:
- _blockTable[index].blockSize = _input.readUint32BE();
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- bufindex = index;
- index++;
- level++;
- index = searchBlocks(_blockTable, _input, index, level, _blockTable[index-1].blockSize + _blockTable[index-1].offset);
- _input.seek(_blockTable[bufindex].offset + _blockTable[bufindex].blockSize, SEEK_SET);
- break;
-
case OFFS:
_blockTable[index].blockSize = _input.readUint32BE();
for (uint32 j=0; j < ((_blockTable[index].blockSize-8) / 4); j++) {
@@ -377,16 +306,6 @@
index++;
break;
- case RMIM:
- _blockTable[index].blockSize = _input.readUint32BE();
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- bufindex = index;
- index++;
- level++;
- index = searchBlocks(_blockTable, _input, index, level, _blockTable[index-1].blockSize + _blockTable[index-1].offset);
- _input.seek(_blockTable[bufindex].offset + _blockTable[bufindex].blockSize, SEEK_SET);
- break;
-
case RMIH:
_blockTable[index].blockSize = _input.readUint32BE();
int numZBuffer;
@@ -395,25 +314,6 @@
index++;
break;
- case 34: // IM00
- case 60:
- case 61:
- case 62:
- case 63:
- case 64:
- case 65:
- case 66:
- case 67:
- case 68:
- _blockTable[index].blockSize = _input.readUint32BE();
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- bufindex = index;
- index++;
- level++;
- index = searchBlocks(_blockTable, _input, index, level, _blockTable[index-1].blockSize + _blockTable[index-1].offset);
- _input.seek(_blockTable[bufindex].offset + _blockTable[bufindex].blockSize, SEEK_SET);
- break;
-
case SMAP:
_blockTable[index].blockSize = _input.readUint32BE();
_gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
@@ -426,13 +326,6 @@
_input.seek(_blockTable[bufindex].offset + _blockTable[bufindex].blockSize, SEEK_SET);
break;
- case SCAL:
- _blockTable[index].blockSize = _input.readUint32BE();
- _input.seek(_blockTable[index].offset + _blockTable[index].blockSize, SEEK_SET);
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- index++;
- break;
-
case AARY:
_blockTable[index].blockSize = _input.readUint32BE();
_blockTable[index].numFiles = _input.readUint16LE();
@@ -440,47 +333,14 @@
_gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
index++;
break;
-
- case ANAM:
- _blockTable[index].blockSize = _input.readUint32BE();
- _input.seek(_blockTable[index].offset + _blockTable[index].blockSize, SEEK_SET);
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- index++;
- break;
-
- case SOUN:
- _blockTable[index].blockSize = _input.readUint32BE();
- _input.seek(_blockTable[index].offset + _blockTable[index].blockSize, SEEK_SET);
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- index++;
- break;
-
- case EXCD:
- case ENCD:
- case NLSC:
- _blockTable[index].blockSize = _input.readUint32BE();
- _input.seek(_blockTable[index].offset + _blockTable[index].blockSize, SEEK_SET);
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- index++;
- break;
- case SCRP:
+ case SOUN:
_blockTable[index].blockSize = _input.readUint32BE();
_input.seek(_blockTable[index].offset + _blockTable[index].blockSize, SEEK_SET);
_gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
index++;
break;
-
- case OBIM:
- _blockTable[index].blockSize = _input.readUint32BE();
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- bufindex = index;
- index++;
- level++;
- index = searchBlocks(_blockTable, _input, index, level, _blockTable[index-1].blockSize + _blockTable[index-1].offset);
- _input.seek(_blockTable[bufindex].offset + _blockTable[bufindex].blockSize, SEEK_SET);
- break;
-
+
case IMHD:
_blockTable[index].blockSize = _input.readUint32BE();
_blockTable[index].width = _input.readUint32LE();
@@ -544,14 +404,6 @@
index = searchBlocks(_blockTable, _input, index, level, _blockTable[index-1].blockSize + _blockTable[index-1].offset);
break;
- case MAP:
- _blockTable[index].blockSize = _input.readUint32BE();
- _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
- index++;
- level++;
- index = searchBlocks(_blockTable, _input, index, level, _blockTable[index-1].blockSize + _blockTable[index-1].offset);
- break;
-
case FRMT:
_blockTable[index].blockSize = _input.readUint32BE();
_input.readUint32BE(); // dwPosition
@@ -694,7 +546,6 @@
break;
-
case LABN:
_input.readUint32LE();
numFiles = _input.readUint32LE();
@@ -768,6 +619,25 @@
case RMSC:
case AKOS:
case ANIM:
+ case LECF:
+ case LFLF:
+ case ROOM:
+ case OBCD:
+ case MAP:
+ case IM00:
+ case IM01:
+ case IM02:
+ case IM03:
+ case IM04:
+ case IM05:
+ case IM06:
+ case IM07:
+ case IM08:
+ case IM09:
+ case RMIM:
+ case PALS:
+ case WRAP:
+ case OBIM:
_blockTable[index].blockSize = _input.readUint32BE();
_gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
bufindex = index;
More information about the Scummvm-git-logs
mailing list