libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-04 16:26:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove warning in simon

Browse Source 
Add INDY3EGA Amiga - experimental support for sound effects, patch #771355

svn-id: r9033
This commit is contained in:
Travis Howell 2003-07-15 07:29:23 +00:00
parent b05e7de7bb
commit eddf075495
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scumm/sound.cpp
View File

@ -486,6 +486,26 @@ void Sound::playSound(int soundID) {
return;
}
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
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) {
//TODO: support maniac v1 sounds
if ((_scumm->_version == 1) && (_scumm->_gameId == GID_MANIAC))

6
simon/vga.cpp
View File

@ -1122,12 +1122,6 @@ void SimonEngine::vc_23_set_sprite_priority() {
uint16 pri = vc_read_next_word();
VgaSprite bak;
if (vsp->id == 0) {
if (_debugMode)
warning("tried to set pri for unknown id %d", _vga_cur_sprite_id);
return;
}
memcpy(&bak, vsp, sizeof(bak));
bak.priority = pri;
bak.unk6 |= 0x8000;