diff --git a/blocks.h b/blocks.h index 5b63468..89988f7 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.10 2003/09/29 10:04:01 khalek Exp $ + * $Header: /Users/sev/projects/sc/s/scummvm/scummex/blocks.h,v 1.11 2003/09/29 10:58:20 khalek Exp $ * */ @@ -159,7 +159,16 @@ enum { SGHD, SGEN, DIGI, - RMDA + RMDA, + BMAP, + WIZH, + AWIZ, + WIZD, + SPOT, + CNVS, + POLD, + LSC2, + FMUS }; enum { diff --git a/resource.cpp b/resource.cpp index 2b7f4f6..6b64019 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.22 2003/09/29 10:04:01 khalek Exp $ + * $Header: /Users/sev/projects/sc/s/scummvm/scummex/resource.cpp,v 1.23 2003/09/29 10:58:20 khalek Exp $ * */ @@ -576,6 +576,8 @@ int Resource::parseBlocks(char *blockName, BlockTable *_blockTable, File& _input case TLKB: case TALK: case SONG: + case DIGI: + case RMDA: _blockTable[index].blockSize = _input.readUint32BE(); _gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID); bufindex = index; diff --git a/resource.h b/resource.h index cb7f30d..fa129f7 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.15 2003/09/29 10:04:01 khalek Exp $ + * $Header: /Users/sev/projects/sc/s/scummvm/scummex/resource.h,v 1.16 2003/09/29 10:58:20 khalek Exp $ * */ @@ -186,24 +186,34 @@ const struct blockInfo blocksInfo[] = { {120, "WVhd", "", 0, "", 31}, {121, "AUdt", "", 0, "", 31}, {122, "WVdt", "", 0, "", 31}, - {123, "TLKB", "", 0, "", 47}, - {124, "TALK", "", 0, "", 47}, - {125, "HSHD", "", 0, "", 47}, + {123, "TLKB", "Talkie ?", 0, "", 47}, + {124, "TALK", "Talkie Sounds", 0, "", 47}, + {125, "HSHD", "Humongous Sound HeaDer", 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}, - {133, "SONG", "", 0, "", 47}, - {134, "SGHD", "", 0, "", 47}, - {135, "SGEN", "", 0, "", 47}, - {136, "DIGI", "", 0, "", 47}, - {137, "RMDA", "", 0, "", 47} + {127, "DIRR", "Directory of Rooms", 0, "", 47}, + {128, "DIRN", "Directory of Sounds", 0, "", 47}, + {129, "DIRC", "Directory of Costumes", 0, "", 47}, + {130, "DIRF", "Directory of Charsets", 0, "", 47}, + {131, "DIRM", "", 0, "", 47}, + {132, "DLFL", "Directory of LFLs", 0, "", 47}, + {133, "DIRS", "", 0, "", 47}, + {134, "SONG", "", 0, "", 47}, + {135, "SGHD", "Song Header", 0, "", 47}, + {136, "SGEN", "Song ?", 0, "", 47}, + {137, "DIGI", "Digital Sound", 0, "", 47}, + {138, "RMDA", "Room Data", 0, "", 47}, + {139, "BMAP", "Bitmap Image", 0, "", 47}, + {140, "WIZH", "", 0, "", 47}, + {141, "AWIZ", "", 0, "", 47}, + {142, "WIZD", "", 0, "", 47}, + {143, "SPOT", "", 0, "", 47}, + {144, "CNVS", "", 0, "", 47}, + {145, "POLD", "", 0, "", 47}, + {146, "LSC2", "", 0, "", 47}, + {147, "FMUS", "Music header?", 0, "", 47} }; -const int numBlocks = 138; +const int numBlocks = 148; const struct blockInfo oldBlocksInfo[] = { {200, "0R", "Directory of Rooms", 0, "", 18}, diff --git a/wxwindows.cpp b/wxwindows.cpp index 460cd13..9c71317 100644 --- a/wxwindows.cpp +++ b/wxwindows.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/wxwindows.cpp,v 1.30 2003/09/28 21:49:25 yoshizf Exp $ + * $Header: /Users/sev/projects/sc/s/scummvm/scummex/wxwindows.cpp,v 1.31 2003/09/29 10:58:20 khalek Exp $ * */ @@ -1182,22 +1182,27 @@ void MainWindow::OnSelChanged(wxTreeEvent& event) { break; case DROO: + case DIRR: bigIconBitmap = wxBitmap(xpm_18_big); break; case DSCR: + case DIRS: bigIconBitmap = wxBitmap(xpm_19_big); break; case DSOU: + case DIRN: bigIconBitmap = wxBitmap(xpm_20_big); break; case DCOS: + case DIRC: bigIconBitmap = wxBitmap(xpm_14_big); break; case DCHR: + case DIRF: bigIconBitmap = wxBitmap(xpm_13_big); break;