thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ENGINES: Replace checkCD with isolated partial methods

Browse source 
This is PR #3018 "rebased" on the current HEAD, after the conflicts with PR #3003 and me botching the rebase in that PR

Old PR is here: https://github.com/scummvm/scummvm/pull/3018
This commit is contained in:
antoniou79 2021-07-24 22:16:45 +03:00 • committed by Eugene Sandulenko
parent c05acdafd5
commit 04642eef8a
10 changed files with 95 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/scumm/scumm.cpp
View file

@ -1503,7 +1503,10 @@ void ScummEngine::setupScumm(const Common::String &macResourceFile) {
// 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();
if (!existExtractedCDAudioFiles()
&& !isDataAndCDAudioReadFromSameCD()) {
warnMissingExtractedCDAudio();
}
_system->getAudioCDManager()->open();
}