[Scummvm-cvs-logs] CVS: scummex blocks.h,1.18,1.19 resource.cpp,1.34,1.35 wxwindows.cpp,1.43,1.44
kirben
kirben at users.sourceforge.net
Sun Jan 15 23:06:05 CET 2006
Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15102
Modified Files:
blocks.h resource.cpp wxwindows.cpp
Log Message:
Add some HE blocks.
Add descriptions for older index.
Index: blocks.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/blocks.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- blocks.h 10 Apr 2005 12:55:09 -0000 1.18
+++ blocks.h 16 Jan 2006 07:05:42 -0000 1.19
@@ -45,6 +45,14 @@
DCOS,
DCHR,
DOBJ,
+ DIRC,
+ DIRF,
+ DIRI,
+ DIRM,
+ DIRN,
+ DIRR,
+ DIRS,
+ DIRT,
cus1,
cus2,
COMP,
@@ -147,18 +155,12 @@
TLKB,
TALK,
HSHD,
- DIRI,
- DIRR,
- DIRN,
- DIRC,
- DIRF,
- DIRM,
DLFL,
- DIRS,
SONG,
SGHD,
SGEN,
DIGI,
+ WSOU,
RMDA,
BMAP,
WIZH,
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- resource.cpp 14 Nov 2005 02:10:56 -0000 1.34
+++ resource.cpp 16 Jan 2006 07:05:42 -0000 1.35
@@ -53,6 +53,14 @@
{"DCOS", "Directory of Costumes", 0, "", 14},
{"DCHR", "Directory of Charsets", 0, "", 13},
{"DOBJ", "Directory of Objects", 0, "", 17},
+ {"DIRC", "Directory of Costumes", 0, "", 47},
+ {"DIRF", "Directory of Charsets", 0, "", 47},
+ {"DIRI", "Directory of Room Images", 0, "", 47},
+ {"DIRN", "Directory of Sounds", 0, "", 47},
+ {"DIRM", "Directory of Images", 0, "", 47},
+ {"DIRR", "Directory of Rooms", 0, "", 47},
+ {"DIRS", "Directory of Scripts", 0, "", 47},
+ {"DIRT", "Directory of Talkies", 0, "", 47},
{"cus1", "bundled file"},
{"cus2", "iMUSE Cue", 0, "", 59},
{"COMP", "Compression Table", 0, "", 9},
@@ -93,7 +101,7 @@
{"SCRP", "Script", 0, "", 41},
{"EXCD", "Exit Code", 0, "", 22},
{"ENCD", "Entry Code", 0, "", 21},
- {"NLSC", "Non Local Script", 0, "", 41},
+ {"NLSC", "Number of Local Scripts", 0, "", 41},
{"OBIM", "Object Image", 0, "", 33},
{"IMHD", "Image Header", 0, "", 26},
{"SOU ", "Sound", 0, "", 59},
@@ -111,7 +119,7 @@
{"STOP", "iMUSE Digital End of Sound Data", 1, "help/specSTOP.html", 27},
{"SYNC", "iMUSE Digital Lip Sync Data", 1, "help/specSYNC.html", 43},
{"IMC", "", 1, "help/specIMC.html", 59},
- {"LSCR", "", 0, "", 41},
+ {"LSCR", "Local Script", 0, "", 41},
{"COST", "", 0, "", 11},
{"CHAR", "", 0, "", 8},
{"BOMP", "", 0, "", 47},
@@ -155,18 +163,12 @@
{"TLKB", "Talkie ?", 0, "", 47},
{"TALK", "Talkie Sounds", 0, "", 47},
{"HSHD", "Humongous Sound HeaDer", 0, "", 47},
- {"DIRI", "", 0, "", 47},
- {"DIRR", "Directory of Rooms", 0, "", 47},
- {"DIRN", "Directory of Sounds", 0, "", 47},
- {"DIRC", "Directory of Costumes", 0, "", 47},
- {"DIRF", "Directory of Charsets", 0, "", 47},
- {"DIRM", "", 0, "", 47},
{"DLFL", "Directory of LFLs", 0, "", 47},
- {"DIRS", "", 0, "", 47},
{"SONG", "", 0, "", 47},
{"SGHD", "Song Header", 0, "", 47},
{"SGEN", "Song ?", 0, "", 47},
{"DIGI", "Digital Sound", 0, "", 47},
+ {"WSOU", "Digital Sound", 0, "", 47},
{"RMDA", "Room Data", 0, "", 38},
{"BMAP", "Bitmap Image", 0, "", 47},
{"WIZH", "", 0, "", 47},
@@ -175,7 +177,7 @@
{"SPOT", "", 0, "", 47},
{"CNVS", "", 0, "", 47},
{"POLD", "", 0, "", 47},
- {"LSC2", "", 0, "", 47},
+ {"LSC2", "Local Script", 0, "", 47},
{"FMUS", "Music header?", 0, "", 47},
{"SKIP", "SMUSH Skip Frame", 0, "", 47},
{"IaCt", "INSANE Action", 0, "", 24}, // small letters are intentional
@@ -194,33 +196,33 @@
const struct blockInfo oldBlocksInfo[] = {
{"0R", "Directory of Rooms", 0, "", 18},
- {"0S", "", 0, "", 19},
- {"0N", "", 0, "", 47},
- {"0C", "", 0, "", 14},
+ {"0S", "Directory of Scripts", 0, "", 19},
+ {"0N", "Directory of Sounds", 0, "", 47},
+ {"0C", "Directory of Costumes", 0, "", 14},
{"0O", "Directory of Objects", 0, "", 17},
- {"RO", "", 0, "", 38},
- {"HD", "", 0, "", 35},
- {"BX", "", 0, "", 4},
- {"PA", "", 0, "", 34},
- {"BM", "", 0, "", 37},
- {"OI", "", 0, "", 33},
- {"OC", "", 0, "", 41},
+ {"RO", "Room Container", 0, "", 38},
+ {"HD", "Room Header", 0, "", 35},
+ {"BX", "Box Description", 0, "", 4},
+ {"PA", "Color Lookup Table", 0, "", 34},
+ {"BM", "Image", 0, "", 37},
+ {"OI", "Object Image", 0, "", 33},
+ {"OC", "Object Code", 0, "", 41},
{"NL", "", 0, "", 41},
{"SL", "", 0, "", 47},
- {"EX", "", 0, "", 22},
- {"EN", "", 0, "", 21},
- {"LC", "", 0, "", 47},
- {"LS", "", 0, "", 41},
- {"SC", "", 0, "", 41},
+ {"EX", "Exit Code", 0, "", 22},
+ {"EN", "Entry Code", 0, "", 21},
+ {"LC", "Number of Local Scripts", 0, "", 47},
+ {"LS", "Local Script", 0, "", 41},
+ {"SC", "Script", 0, "", 41},
{"CO", "", 0, "", 11},
{"LE", "LucasArts Entertainment Company Files", 0, "", 6},
{"FO", "", 0, "", 44},
- {"LF", "", 0, "", 58},
- {"CC", "", 0, "", 12},
- {"SP", "", 0, "", 47},
- {"SA", "", 0, "", 40},
- {"SO", "", 0, "", 59},
- {"RN", "", 0, "", 47},
+ {"LF", "LucasArts File Format", 0, "", 58},
+ {"CC", "Color Cycle", 0, "", 12},
+ {"SP", "EGA Palette", 0, "", 47},
+ {"SA", "Scaling", 0, "", 40},
+ {"SO", "Sound", 0, "", 59},
+ {"RN", "Room Names", 0, "", 47},
{"WA", "", 0, "", 31},
{"AD", "", 0, "", 31},
{0, 0, 0, 0, 0}
@@ -415,6 +417,14 @@
case DCOS:
case DCHR:
case DOBJ:
+ case DIRC:
+ case DIRF:
+ case DIRI:
+ case DIRM:
+ case DIRN:
+ case DIRR:
+ case DIRS:
+ case DIRT:
_blockTable[index].blockSize = _input.readUint32BE();
_blockTable[index].numFiles = _input.readUint16LE();
_input.seek(_blockTable[index].offset + _blockTable[index].blockSize, SEEK_SET);
@@ -801,6 +811,7 @@
case TALK:
case SONG:
case DIGI:
+ case WSOU:
case RMDA:
_blockTable[index].blockSize = _input.readUint32BE();
_gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);
Index: wxwindows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- wxwindows.cpp 10 Apr 2005 14:55:20 -0000 1.43
+++ wxwindows.cpp 16 Jan 2006 07:05:42 -0000 1.44
@@ -609,6 +609,14 @@
case DCOS:
case DCHR:
case DOBJ:
+ case DIRC:
+ case DIRF:
+ case DIRI:
+ case DIRM:
+ case DIRN:
+ case DIRR:
+ case DIRS:
+ case DIRT:
updateLabel(_SpecLabel[0], "Number of items:", block.numFiles);
break;
More information about the Scummvm-git-logs
mailing list