diff options
Diffstat (limited to 'engines/scumm/saveload.cpp')
| -rw-r--r-- | engines/scumm/saveload.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 7362dcd8cf..c178a883c4 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -42,7 +42,6 @@ #include "scumm/he/sprite_he.h" #include "scumm/verbs.h" -#include "sound/audiocd.h" #include "sound/mixer.h" #include "graphics/thumbnail.h" @@ -1099,7 +1098,7 @@ void ScummEngine::saveOrLoad(Serializer *s) { // as AudioCDManager::Status::playing, and MSVC6 has // a fit with that. This typedef simplifies the notation // to something MSVC6 can grasp. - typedef Audio::AudioCDManager::Status AudioCDManager_Status; + typedef AudioCDManager::Status AudioCDManager_Status; const SaveLoadEntry audioCDEntries[] = { MKLINE(AudioCDManager_Status, playing, sleUint32, VER(24)), MKLINE(AudioCDManager_Status, track, sleInt32, VER(24)), @@ -1371,15 +1370,15 @@ void ScummEngine::saveOrLoad(Serializer *s) { // Save/load the Audio CD status // if (s->getVersion() >= VER(24)) { - Audio::AudioCDManager::Status info; + AudioCDManager::Status info; if (s->isSaving()) - info = AudioCD.getStatus(); + info = _system->getAudioCD()->getStatus(); s->saveLoadArrayOf(&info, 1, sizeof(info), audioCDEntries); // If we are loading, and the music being loaded was supposed to loop // forever, then resume playing it. This helps a lot when the audio CD // is used to provide ambient music (see bug #788195). if (s->isLoading() && info.playing && info.numLoops < 0) - AudioCD.play(info.track, info.numLoops, info.start, info.duration); + _system->getAudioCD()->play(info.track, info.numLoops, info.start, info.duration); } |