diff options
| author | Jamieson Christian | 2003-08-13 15:34:00 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-08-13 15:34:00 +0000 |
| commit | bfde325d35089c329334fb6e6e8263dbdd42136b (patch) | |
| tree | be1a356ee55a639bfd962fa4eb0ef50d6ad2e50d /common | |
| parent | a02fe9e46e6b87a879e5800bc0b4992be2b63fbf (diff) | |
| download | scummvm-rg350-bfde325d35089c329334fb6e6e8263dbdd42136b.tar.gz scummvm-rg350-bfde325d35089c329334fb6e6e8263dbdd42136b.tar.bz2 scummvm-rg350-bfde325d35089c329334fb6e6e8263dbdd42136b.zip | |
Fix ALWAYS_ADLIB override of native driver selection
svn-id: r9658
Diffstat (limited to 'common')
| -rw-r--r-- | common/gameDetector.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index 7f211a0487..9a4fa6fc32 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -704,7 +704,10 @@ int GameDetector::detectMain() { * and the game is one of those that want adlib as * default, OR if the game is an older game that doesn't * support anything else anyway. */ - if ((_game.adlib & VersionSettings::ADLIB_ALWAYS) && _midi_driver != MD_NULL || + bool nativeMidiDriver = + (_midi_driver != MD_NULL && _midi_driver != MD_ADLIB && + _midi_driver != MD_PCSPK && _midi_driver != MD_PCJR); + if ((_game.adlib & VersionSettings::ADLIB_ALWAYS) && nativeMidiDriver || (_game.adlib & VersionSettings::ADLIB_PREFERRED) && _midi_driver == MD_AUTO) { _midi_driver = MD_ADLIB; } |