diff options
| author | Robin Watts | 2009-08-21 22:29:28 +0000 |
|---|---|---|
| committer | Robin Watts | 2009-08-21 22:29:28 +0000 |
| commit | 894635e91d7bdaa4517618a957441db016b2798b (patch) | |
| tree | d6c6fa71c6661a1cc6682bce3cd6476a80ed4c32 /engines/scumm/he | |
| parent | edc8ffdaba5756c37aa84be5b933bc238c759ec2 (diff) | |
| download | scummvm-rg350-894635e91d7bdaa4517618a957441db016b2798b.tar.gz scummvm-rg350-894635e91d7bdaa4517618a957441db016b2798b.tar.bz2 scummvm-rg350-894635e91d7bdaa4517618a957441db016b2798b.zip | |
Attempt to fix builds that use the ARM screen column clear code; add new
bitdepth argument that was missing in ARM builds previously.
Also fix a few warnings.
Also fix the WinCE build which fails in the SDL init call with a missing
bitdepth field.
Untested at this point (build certainly gets further than before). Committing
this seems reasonable, as it can't make it any worse :)
svn-id: r43614
Diffstat (limited to 'engines/scumm/he')
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index 01f29d5db9..feaf273b4e 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -645,7 +645,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) Audio::AudioStream *voxStream = Audio::makeADPCMStream(&stream, false, size, Audio::kADPCMMSIma, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign); sound = (char *)malloc(size * 4); - size = voxStream->readBuffer((int16*)sound, size * 2); + size = voxStream->readBuffer((int16*)(void *)sound, size * 2); size *= 2; // 16bits. delete voxStream; |