[Scummvm-cvs-logs] SF.net SVN: scummvm: [31483] scummvm/trunk/engines/scumm/sound.cpp
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Fri Apr 11 10:13:47 CEST 2008
Revision: 31483
http://scummvm.svn.sourceforge.net/scummvm/?rev=31483&view=rev
Author: Kirben
Date: 2008-04-11 01:13:47 -0700 (Fri, 11 Apr 2008)
Log Message:
-----------
Allow mixed Adlib/MIDI mode in VGA version of SOMI.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/sound.cpp
Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp 2008-04-11 08:12:22 UTC (rev 31482)
+++ scummvm/trunk/engines/scumm/sound.cpp 2008-04-11 08:13:47 UTC (rev 31483)
@@ -2111,7 +2111,16 @@
}
}
- if ((_musicType == MDT_ADLIB) && ad_offs != 0) {
+ if ((_musicType == MDT_PCSPK) && wa_offs != 0) {
+ if (_game.features & GF_OLD_BUNDLE) {
+ _fileHandle->seek(wa_offs, SEEK_SET);
+ _fileHandle->read(_res->createResource(rtSound, idx, wa_size), wa_size);
+ } else {
+ _fileHandle->seek(wa_offs - 6, SEEK_SET);
+ _fileHandle->read(_res->createResource(rtSound, idx, wa_size + 6), wa_size + 6);
+ }
+ return 1;
+ } else if (ad_offs != 0) {
// AD resources have a header, instrument definitions and one MIDI track.
// We build an 'ADL ' resource from that:
// 8 bytes resource header
@@ -2133,15 +2142,6 @@
convertADResource(_res, _game, idx, ptr, ad_size);
free(ptr);
return 1;
- } else if ((_musicType == MDT_PCSPK) && wa_offs != 0) {
- if (_game.features & GF_OLD_BUNDLE) {
- _fileHandle->seek(wa_offs, SEEK_SET);
- _fileHandle->read(_res->createResource(rtSound, idx, wa_size), wa_size);
- } else {
- _fileHandle->seek(wa_offs - 6, SEEK_SET);
- _fileHandle->read(_res->createResource(rtSound, idx, wa_size + 6), wa_size + 6);
- }
- return 1;
} else if (ro_offs != 0) {
_fileHandle->seek(ro_offs - 2, SEEK_SET);
_fileHandle->read(_res->createResource(rtSound, idx, ro_size - 4), ro_size - 4);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list