mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-14 05:38:56 +00:00
Merge branch 'master' of github.com:scummvm/scummvm
This commit is contained in:
commit
371d5e1d90
@ -684,7 +684,7 @@ void Sound::playRawData(byte *soundData, uint sound, uint size, uint freq) {
|
||||
memcpy(buffer, soundData, size);
|
||||
|
||||
byte flags = 0;
|
||||
if (_vm->getPlatform() == Common::kPlatformDOS)
|
||||
if (_vm->getPlatform() == Common::kPlatformDOS && _vm->getGameId() != GID_ELVIRA2)
|
||||
flags = Audio::FLAG_UNSIGNED;
|
||||
|
||||
Audio::AudioStream *stream = Audio::makeRawStream(buffer, size, freq, flags);
|
||||
|
@ -94,8 +94,7 @@ void AGOSEngine::loadZone(uint16 zoneNum, bool useError) {
|
||||
|
||||
vpe->sfxFile = NULL;
|
||||
|
||||
if ((getPlatform() == Common::kPlatformAmiga || getPlatform() == Common::kPlatformAtariST) &&
|
||||
getGameType() == GType_ELVIRA2) {
|
||||
if (getGameType() == GType_ELVIRA2) {
|
||||
// A singe sound file is used for Amiga and AtariST versions
|
||||
if (loadVGASoundFile(1, 3)) {
|
||||
vpe->sfxFile = _block;
|
||||
|
Loading…
Reference in New Issue
Block a user