ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the Amiga option costumes/palette only again.

Browse Source 
svn-id: r9057
This commit is contained in:
Travis Howell
2003-07-17 11:20:31 +00:00
parent 7c5eca2797
commit 05b40887d9
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scumm/scummvm.cpp
+1 -1
View File
@@ -629,7 +629,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
_imuse = NULL;
_playerV2 = NULL;
} else if (_features & GF_OLD_BUNDLE) {
if ((_features & GF_AMIGA) || ((_version == 1) && (_gameId == GID_MANIAC)))
if ((_version == 1) && (_gameId == GID_MANIAC))
_playerV2 = NULL;
else
_playerV2 = new Player_V2(this);
scumm/sound.cpp
+16 -14
View File
@@ -489,21 +489,23 @@ void Sound::playSound(int soundID) {
if ((_scumm->_features & GF_AMIGA) && (_scumm->_version == 3))
{
// experimental support for Indy3 Amiga sound effects
if (READ_BE_UINT16(ptr + 26) == 0x00FF) // looped sound
// TODO: support looping sounds
// ptr + 14 seems to be looping duration
flags = 0;
else if (READ_BE_UINT16(ptr + 26) == 0x0001) // nonlooped sound
flags = 0; //
else if (READ_BE_UINT16(ptr + 26) == 0x0101) // background music
// TODO: support music
bool amigatest = (READ_LE_UINT16(ptr + 26) == 0x0001) || (READ_LE_UINT16(ptr + 26) == 0x0001)
|| (READ_LE_UINT16(ptr + 26) == 0x00FF);
if (amigatest) {
if (READ_BE_UINT16(ptr + 26) == 0x00FF) // looped sound
// TODO: support looping sounds
// ptr + 14 seems to be looping duration
flags = 0;
else if (READ_BE_UINT16(ptr + 26) == 0x0001) // nonlooped sound
flags = 0; //
else if (READ_BE_UINT16(ptr + 26) == 0x0101) // background music
// TODO: support music
return;
size = READ_BE_UINT16(ptr + 12);
rate = 11000;
_scumm->_mixer->playRaw(NULL, ptr + 28, size, rate, flags, soundID);
return;
else
debug(3,"Unknown sound type detected!");
size = READ_BE_UINT16(ptr + 12);
rate = 11000;
_scumm->_mixer->playRaw(NULL, ptr + 28, size, rate, flags, soundID);
return;
}
}
if (_scumm->_features & GF_OLD_BUNDLE) {