[Scummvm-devel] [Scummvm-cvs-logs] SF.net SVN: scummvm:[52198] scummvm/trunk
athrxx
athrxx at users.sourceforge.net
Sun Aug 22 23:03:59 CEST 2010
Should be fixed now (at least be in the same state as before).
I did just a quick test with Monkey Island DOS CD and SEGA-CD and both seem
to be okay.
IT seems that they use 'SOUN' resources for CD audio only, but 'SBL '
resources for sound effects (Unlike FM-TOWNS, where all sounds are contained
in 'SOUN' resources).
Please check whether you still notice anything strange.
Florian
-----Ursprüngliche Nachricht-----
Von: Torbjörn Andersson [mailto:eriktorbjorn at telia.com]
Gesendet: Sonntag, 22. August 2010 13:58
An: yotam barnoy
Cc: athrxx at users.sourceforge.net; ScummVM devel
Betreff: Re: [Scummvm-devel] [Scummvm-cvs-logs] SF.net SVN: scummvm:[52198]
scummvm/trunk
On 2010-08-22 13:32, yotam barnoy wrote:
> MI1 CD w/MP3: intro no longer plays for me after this revision. I get
> only a static image of the LucasArts logo. Pressing escape moves to
> the next section though.
It's probably because this part of the code (which covered more than
just the FM-TOWNS games) got removed:
>> Modified: scummvm/trunk/engines/scumm/sound.cpp
>> ===================================================================
>> --- scummvm/trunk/engines/scumm/sound.cpp 2010-08-18 20:41:03 UTC
(rev 52197)
>> +++ scummvm/trunk/engines/scumm/sound.cpp 2010-08-18 21:38:43 UTC
(rev 52198)
...
>> - else if ((_vm->_game.platform == Common::kPlatformFMTowns&&
_vm->_game.version == 3) || READ_BE_UINT32(ptr) == MKID_BE('SOUN') ||
READ_BE_UINT32(ptr) == MKID_BE('TOWS')) {
...
>> - switch (type) {
...
>> - case 2: // CD track resource
>> - ptr += 0x16;
>> -
>> - if (soundID == _currentCDSound&& pollCD() == 1)
{
>> - return;
>> - }
>> -
>> - {
>> - int track = ptr[0];
>> - int loops = ptr[1];
>> - int start = (ptr[2] * 60 + ptr[3]) * 75 +
ptr[4];
>> - int end = (ptr[5] * 60 + ptr[6]) * 75 +
ptr[7];
>> -
>> - playCDTrack(track, loops == 0xff ? -1 :
loops, start, end<= start ? 0 : end - start);
>> - }
>> -
>> - _currentCDSound = soundID;
>> - break;
But I'm uncertain of exactly how much of it needs to be put back.
Torbjörn Andersson
----------------------------------------------------------------------------
--
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Scummvm-devel mailing list
Scummvm-devel at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/scummvm-devel
More information about the Scummvm-devel
mailing list