thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Voices were broken in Simon on Big Endian systems ...

Browse source 
svn-id: r4612
This commit is contained in:
Ruediger Hanke 2002-07-21 14:31:58 +00:00
parent 8de1ace6c7
commit 59c58a3b68
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
simon/simon.cpp
View file

@ -4613,15 +4613,15 @@ void SimonState::initSound()
_effects_offsets = NULL;
_effects_file = fopen_maybe_lowercase(e);
if (_effects_file == NULL)
return;
if (_effects_file != NULL)
{
_effects_offsets = (uint32 *)malloc(gss->NUM_EFFECTS_RESOURCES * sizeof(uint32));
if (_effects_offsets == NULL)
error("Out of memory for effects offsets");
_effects_offsets = (uint32 *)malloc(gss->NUM_EFFECTS_RESOURCES * sizeof(uint32));
if (_effects_offsets == NULL)
error("Out of memory for effects offsets");
if (fread(_effects_offsets, gss->NUM_EFFECTS_RESOURCES * sizeof(uint32), 1, _effects_file) != 1)
error("Cannot read effects offsets");
if (fread(_effects_offsets, gss->NUM_EFFECTS_RESOURCES * sizeof(uint32), 1, _effects_file) != 1)
error("Cannot read effects offsets");
}
#if defined(SCUMM_BIG_ENDIAN)
for (int r = 0; r < gss->NUM_VOICE_RESOURCES; r++)
@ -4688,7 +4688,6 @@ void SimonState::playVoice(uint voice)
|| wave_hdr.fmt != MKID('fmt ') || READ_LE_UINT16(&wave_hdr.format_tag) != 1
|| READ_LE_UINT16(&wave_hdr.channels) != 1
|| READ_LE_UINT16(&wave_hdr.bits_per_sample) != 8) {
warning("playVoice(%d): cannot read RIFF header", voice);
return;
}