libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 17:29:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add RO sound reosurce detection to small_header games

Browse Source 
svn-id: r9682
This commit is contained in:
Travis Howell 2003-08-14 06:28:54 +00:00
parent 1e8e59c2b2
commit 8781f5e6f6
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
scumm/resource.cpp
View File

@ -1429,6 +1429,7 @@ int Scumm::convertADResource(int type, int idx, byte * src_ptr, int size) {
int Scumm::readSoundResourceSmallHeader(int type, int idx) { int Scumm::readSoundResourceSmallHeader(int type, int idx) {
uint32 pos, total_size, size, tag; uint32 pos, total_size, size, tag;
uint32 ad_size = 0, ad_offs = 0; uint32 ad_size = 0, ad_offs = 0;
uint32 ro_size = 0, ro_offs = 0;
uint32 wa_size = 0, wa_offs = 0; uint32 wa_size = 0, wa_offs = 0;
debug(4, "readSoundResourceSmallHeader(%s,%d)", resTypeFromId(type), idx); debug(4, "readSoundResourceSmallHeader(%s,%d)", resTypeFromId(type), idx);
@ -1450,31 +1451,36 @@ int Scumm::readSoundResourceSmallHeader(int type, int idx) {
(char) (tag & 0xff), (char) (tag & 0xff),
(char) ((tag >> 8) & 0xff), size); (char) ((tag >> 8) & 0xff), size);
pos = 6; if (tag == 0x5247) { // RO
while (pos < total_size) { ro_size = size;
size = _fileHandle.readUint32LE(); ro_offs = _fileHandle.pos();
tag = _fileHandle.readUint16LE(); } else {
debug(4, " tag='%c%c', size=%d", pos = 6;
(char) (tag & 0xff), while (pos < total_size) {
(char) ((tag >> 8) & 0xff), size); size = _fileHandle.readUint32LE();
pos += size; tag = _fileHandle.readUint16LE();
debug(4, " tag='%c%c', size=%d",
(char) (tag & 0xff),
(char) ((tag >> 8) & 0xff), size);
pos += size;
// MI1 and Indy3 uses one or more nested SO resources, which contains AD and WA // MI1 and Indy3 uses one or more nested SO resources, which contains AD and WA
// resources. // resources.
if ((tag == 0x4441) && !(ad_offs)) { // AD if ((tag == 0x4441) && !(ad_offs)) { // AD
ad_size = size; ad_size = size;
ad_offs = _fileHandle.pos(); ad_offs = _fileHandle.pos();
} else if ((tag == 0x4157) && !(wa_offs)) { // WA } else if ((tag == 0x4157) && !(wa_offs)) { // WA
wa_size = size; wa_size = size;
wa_offs = _fileHandle.pos(); wa_offs = _fileHandle.pos();
} else { // other AD, WA and nested SO resources } else { // other AD, WA and nested SO resources
if (tag == 0x4F53) { // SO if (tag == 0x4F53) { // SO
pos -= size; pos -= size;
size = 6; size = 6;
pos += 6; pos += 6;
}
} }
_fileHandle.seek(size - 6, SEEK_CUR);
} }
_fileHandle.seek(size - 6, SEEK_CUR);
} }
} }
@ -1487,7 +1493,11 @@ int Scumm::readSoundResourceSmallHeader(int type, int idx) {
// 7 bytes MIDI tempo sysex // 7 bytes MIDI tempo sysex
// + some default instruments // + some default instruments
if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && wa_offs != 0) { if (ro_offs != 0) {
_fileHandle.seek(ro_offs - 6, SEEK_SET);
_fileHandle.read(createResource(type, idx, ro_size + 6), ro_size + 6);
return 1;
} else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && wa_offs != 0) {
if (_features & GF_OLD_BUNDLE) { if (_features & GF_OLD_BUNDLE) {
_fileHandle.seek(wa_offs, SEEK_SET); _fileHandle.seek(wa_offs, SEEK_SET);
_fileHandle.read(createResource(type, idx, wa_size), wa_size); _fileHandle.read(createResource(type, idx, wa_size), wa_size);