diff options
author | Johannes Schickel | 2010-01-12 21:07:56 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-01-12 21:07:56 +0000 |
commit | 0d995c592046aadbfcb8f46a252537da312912c5 (patch) | |
tree | 95a0a8d25372f887fe656f6ba61f050cc28845d4 /engines/saga | |
parent | 1ebe047972e2df513449db6aa615f6ab17dd6fb7 (diff) | |
download | scummvm-rg350-0d995c592046aadbfcb8f46a252537da312912c5.tar.gz scummvm-rg350-0d995c592046aadbfcb8f46a252537da312912c5.tar.bz2 scummvm-rg350-0d995c592046aadbfcb8f46a252537da312912c5.zip |
Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company.
Check this for reference:
http://en.wikipedia.org/wiki/Ad_Lib,_Inc.
http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card)
This commit does not touch "adlib" and "ADLIB" uses!
Also it does not update all the SCUMM detection entries, which still use "Adlib".
svn-id: r47279
Diffstat (limited to 'engines/saga')
-rw-r--r-- | engines/saga/music.cpp | 6 | ||||
-rw-r--r-- | engines/saga/music.h | 4 | ||||
-rw-r--r-- | engines/saga/saga.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index 52befa3dd3..34b35305c2 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -370,9 +370,9 @@ void Music::play(uint32 resourceId, MusicFlags flags) { // file, and I've tentatively reached the conclusion // that they are both General MIDI. My guess is that // the FM file has been reorchestrated to sound better - // on Adlib and other FM synths. + // on AdLib and other FM synths. // - // Sev says the Adlib music does not sound like in the + // Sev says the AdLib music does not sound like in the // original, but I still think assuming General MIDI is // the right thing to do. Some music, like the End // Title (song 0) sound absolutely atrocious when piped @@ -391,7 +391,7 @@ void Music::play(uint32 resourceId, MusicFlags flags) { // Note that the IHNM demo has only got one music file // (music.rsc). It is assumed that it contains FM music - if (hasAdlib() || _vm->getFeatures() & GF_IHNM_DEMO) { + if (hasAdLib() || _vm->getFeatures() & GF_IHNM_DEMO) { context = _vm->_resource->getContext(GAME_MUSICFILE_FM); } else { context = _vm->_resource->getContext(GAME_MUSICFILE_GM); diff --git a/engines/saga/music.h b/engines/saga/music.h index 0469db7cf1..44a87f28b3 100644 --- a/engines/saga/music.h +++ b/engines/saga/music.h @@ -109,8 +109,8 @@ public: ~Music(); void setNativeMT32(bool b) { _player->setNativeMT32(b); } bool hasNativeMT32() { return _player->hasNativeMT32(); } - void setAdlib(bool b) { _adlib = b; } - bool hasAdlib() { return _adlib; } + void setAdLib(bool b) { _adlib = b; } + bool hasAdLib() { return _adlib; } void setPassThrough(bool b) { _player->setPassThrough(b); } bool isPlaying(); bool hasDigitalMusic() { return _digitalMusic; } diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index 5553291cef..d3b3a5b745 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -237,7 +237,7 @@ Common::Error SagaEngine::run() { _music = new Music(this, _mixer, _driver); _music->setNativeMT32(native_mt32); - _music->setAdlib(adlib); + _music->setAdLib(adlib); _render = new Render(this, _system); if (!_render->initialized()) { return Common::kUnknownError; |