diff --git a/blocks.h b/blocks.h index 2b3be24..c56c55c 100644 --- a/blocks.h +++ b/blocks.h @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Header: /Users/sev/projects/sc/s/scummvm/scummex/blocks.h,v 1.8 2003/09/28 21:49:25 yoshizf Exp $ + * $Header: /Users/sev/projects/sc/s/scummvm/scummex/blocks.h,v 1.9 2003/09/29 09:43:18 khalek Exp $ * */ @@ -143,7 +143,18 @@ enum { AUhd, WVhd, AUdt, - WVdt + WVdt, + TLKB, + TALK, + HSHD, + DIRI, + DIRR, + DIRN, + DIRC, + DIRF, + DIRM, + DLFL, + DIRS }; enum { diff --git a/resource.cpp b/resource.cpp index bdb139a..f3b27d0 100644 --- a/resource.cpp +++ b/resource.cpp @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Header: /Users/sev/projects/sc/s/scummvm/scummex/resource.cpp,v 1.20 2003/09/28 21:49:25 yoshizf Exp $ + * $Header: /Users/sev/projects/sc/s/scummvm/scummex/resource.cpp,v 1.21 2003/09/29 09:43:18 khalek Exp $ * */ @@ -573,6 +573,8 @@ int Resource::parseBlocks(char *blockName, BlockTable *_blockTable, File& _input 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::parseOldBlocks(char *blockName, BlockTable *_blockTable, File& _in 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; } diff --git a/resource.h b/resource.h index 9d6ff55..b92dd5a 100644 --- a/resource.h +++ b/resource.h @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Header: /Users/sev/projects/sc/s/scummvm/scummex/resource.h,v 1.13 2003/09/28 21:49:25 yoshizf Exp $ + * $Header: /Users/sev/projects/sc/s/scummvm/scummex/resource.h,v 1.14 2003/09/29 09:43:18 khalek Exp $ * */ @@ -185,9 +185,21 @@ const struct blockInfo blocksInfo[] = { {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}, {201, "0S", "", 0, "", 19},