diff options
| author | Johannes Schickel | 2012-09-26 04:17:31 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-09-26 04:17:55 +0200 |
| commit | 89abab97e3124fa25eb4c7d3e8b38501747a8d17 (patch) | |
| tree | d60a833c9ed352fbe44c0b9a6b8ff43fcbc29419 /engines/scumm/sound.cpp | |
| parent | a6c6c74350bb673c178d9756a1625ca128d24f21 (diff) | |
| download | scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.tar.gz scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.tar.bz2 scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.zip | |
JANITORIAL: Remove trailing whitespaces.
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
Diffstat (limited to 'engines/scumm/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 43c86db85f..a1cecfa0b3 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -957,7 +957,7 @@ void Sound::setupSfxFile() { if (file.open(tmp)) _sfxFilename = tmp; - + if (_vm->_game.heversion <= 74) _sfxFileEncByte = 0x69; @@ -1182,7 +1182,7 @@ int ScummEngine::readSoundResource(ResId idx) { // its sound resources, and Amiga games, which feature only ROL // resources, since we are a doing Midi -> AdLib conversion for // these. - if ((_sound->_musicType == MDT_ADLIB || _sound->_musicType == MDT_TOWNS) && pri != 16 + if ((_sound->_musicType == MDT_ADLIB || _sound->_musicType == MDT_TOWNS) && pri != 16 && pri != 15 && pri != 10 && pri != 2 && _game.platform != Common::kPlatformAmiga) pri = -1; |