diff options
| author | Martin Kiewitz | 2015-07-03 02:05:59 +0200 |
|---|---|---|
| committer | Martin Kiewitz | 2015-07-03 02:05:59 +0200 |
| commit | 32b44b7c18531eb743b88e5d42aac5e24d22f72e (patch) | |
| tree | 12b72877a5527fb18ba2a67d64de09041658fee6 | |
| parent | 04146fc9b399f99165ff71e609450378f6928847 (diff) | |
| parent | 1d204c752f82ef38a58d1f8d78af8585600f21a0 (diff) | |
| download | scummvm-rg350-32b44b7c18531eb743b88e5d42aac5e24d22f72e.tar.gz scummvm-rg350-32b44b7c18531eb743b88e5d42aac5e24d22f72e.tar.bz2 scummvm-rg350-32b44b7c18531eb743b88e5d42aac5e24d22f72e.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
| -rw-r--r-- | engines/saga/music.cpp | 6 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_people.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index bc583ed7b0..71d061a0a0 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -49,7 +49,11 @@ MusicDriver::MusicDriver() : _isGM(false) { switch (_driverType) { case MT_ADLIB: _milesAudioMode = true; - _driver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.OPL"); + if (Common::File::exists("INSTR.AD") && Common::File::exists("INSTR.OPL")) { + _driver = Audio::MidiDriver_Miles_AdLib_create("INSTR.AD", "INSTR.OPL"); + } else { + _driver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.OPL"); + } break; case MT_MT32: _milesAudioMode = true; diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp index 42a7d26a7d..f22ce87574 100644 --- a/engines/sherlock/tattoo/tattoo_people.cpp +++ b/engines/sherlock/tattoo/tattoo_people.cpp @@ -454,11 +454,11 @@ void TattooPerson::setWalking() { // and set the delta Y depending on the direction if (_walkDest.y < (_position.y / FIXED_INT_MULTIPLIER)) { _sequenceNumber = WALK_UP; - _delta.y = speed.y * -FIXED_INT_MULTIPLIER; + _delta.y = speed.y * -(FIXED_INT_MULTIPLIER / 10); } else { speed.y = diagSpeed.y; _sequenceNumber = WALK_DOWN; - _delta.y = speed.y * FIXED_INT_MULTIPLIER; + _delta.y = speed.y * (FIXED_INT_MULTIPLIER / 10); } // Set the delta x |