diff options
| author | Matthew Hoops | 2015-09-29 21:00:56 -0400 |
|---|---|---|
| committer | Johannes Schickel | 2016-03-13 13:52:24 +0100 |
| commit | fb6fe1332aaa9ab4d0ec0ad4ee8015ce4076bd85 (patch) | |
| tree | cc1284f92298cfd8307ba6985f4105bdce147324 /engines | |
| parent | d85eb8ded68a20de383d84064aacd1a4c81db4e9 (diff) | |
| download | scummvm-rg350-fb6fe1332aaa9ab4d0ec0ad4ee8015ce4076bd85.tar.gz scummvm-rg350-fb6fe1332aaa9ab4d0ec0ad4ee8015ce4076bd85.tar.bz2 scummvm-rg350-fb6fe1332aaa9ab4d0ec0ad4ee8015ce4076bd85.zip | |
BACKENDS: Move to an openCD() without parameters as the public API
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/drascula/drascula.cpp | 4 | ||||
| -rw-r--r-- | engines/gob/gob.cpp | 4 | ||||
| -rw-r--r-- | engines/groovie/groovie.cpp | 6 | ||||
| -rw-r--r-- | engines/made/made.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 5 | ||||
| -rw-r--r-- | engines/tinsel/tinsel.cpp | 4 |
6 files changed, 6 insertions, 21 deletions
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index c72d77c281..1a7659fc85 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -183,9 +183,7 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam const Common::FSNode gameDataDir(ConfMan.get("path")); SearchMan.addSubDirectoryMatching(gameDataDir, "audio"); - int cd_num = ConfMan.getInt("cdrom"); - if (cd_num >= 0) - _system->getAudioCDManager()->openCD(cd_num); + _system->getAudioCDManager()->openCD(); _lang = kEnglish; diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 24bdb858d8..df2d804bd2 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -296,9 +296,7 @@ Common::Error GobEngine::run() { if (isCD()) checkCD(); - int cd_num = ConfMan.getInt("cdrom"); - if (cd_num >= 0) - _system->getAudioCDManager()->openCD(cd_num); + _system->getAudioCDManager()->openCD(); _global->_debugFlag = 1; _video->_doRangeClamp = true; diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index 2021cef6e8..a25bf0008b 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -257,11 +257,7 @@ Common::Error GroovieEngine::run() { // the same cd if (getPlatform() != Common::kPlatformIOS) { checkCD(); - - // Initialize the CD - int cd_num = ConfMan.getInt("cdrom"); - if (cd_num >= 0) - _system->getAudioCDManager()->openCD(cd_num); + _system->getAudioCDManager()->openCD(); } while (!shouldQuit()) { diff --git a/engines/made/made.cpp b/engines/made/made.cpp index ab07ef757b..57130e277f 100644 --- a/engines/made/made.cpp +++ b/engines/made/made.cpp @@ -67,9 +67,7 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng _console = new MadeConsole(this); - int cd_num = ConfMan.getInt("cdrom"); - if (cd_num >= 0) - _system->getAudioCDManager()->openCD(cd_num); + _system->getAudioCDManager()->openCD(); _pmvPlayer = new PmvPlayer(this, _mixer); _res = new ResourceReader(); diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 89d2d3dc72..680bdb2463 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1275,10 +1275,7 @@ void ScummEngine::setupScumm() { // On some systems it's not safe to run CD audio games from the CD. if (_game.features & GF_AUDIOTRACKS && !Common::File::exists("CDDA.SOU")) { checkCD(); - - int cd_num = ConfMan.getInt("cdrom"); - if (cd_num >= 0) - _system->getAudioCDManager()->openCD(cd_num); + _system->getAudioCDManager()->openCD(); } // Create the sound manager diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 2adddca4fd..782dd7ae48 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -841,9 +841,7 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) if (!scumm_stricmp(g->gameid, gameid)) _gameId = g->id; - int cd_num = ConfMan.getInt("cdrom"); - if (cd_num >= 0) - _system->getAudioCDManager()->openCD(cd_num); + _system->getAudioCDManager()->openCD(); _mousePos.x = 0; _mousePos.y = 0; |