diff options
| author | Filippos Karapetis | 2010-11-09 18:50:20 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-11-20 22:43:10 +0100 |
| commit | d3811422f82180e482fc9dc3aabca48df8844119 (patch) | |
| tree | ff4dc223616ca6bf299dc7dd8aa2fe337e7589e6 | |
| parent | dde75d709e219f97e0b5ab103da96fe734631acb (diff) | |
| download | scummvm-rg350-d3811422f82180e482fc9dc3aabca48df8844119.tar.gz scummvm-rg350-d3811422f82180e482fc9dc3aabca48df8844119.tar.bz2 scummvm-rg350-d3811422f82180e482fc9dc3aabca48df8844119.zip | |
TOLTECS: Fixed compilation and reduced header dependencies a bit
| -rw-r--r-- | engines/toltecs/sound.h | 1 | ||||
| -rw-r--r-- | engines/toltecs/toltecs.cpp | 3 | ||||
| -rw-r--r-- | engines/toltecs/toltecs.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/engines/toltecs/sound.h b/engines/toltecs/sound.h index 244fcc300d..f560168bb3 100644 --- a/engines/toltecs/sound.h +++ b/engines/toltecs/sound.h @@ -37,7 +37,6 @@ #include "sound/audiostream.h" #include "sound/mixer.h" -#include "sound/audiocd.h" #include "sound/decoders/voc.h" #include "engines/engine.h" diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp index 9a0f6694b2..ae5e17cae4 100644 --- a/engines/toltecs/toltecs.cpp +++ b/engines/toltecs/toltecs.cpp @@ -39,6 +39,7 @@ #include "engines/util.h" #include "sound/mixer.h" +#include "backends/audiocd/audiocd.h" #include "toltecs/toltecs.h" #include "toltecs/animation.h" @@ -74,7 +75,7 @@ ToltecsEngine::ToltecsEngine(OSystem *syst, const ToltecsGameDescription *gameDe int cd_num = ConfMan.getInt("cdrom"); if (cd_num >= 0) - _system->openCD(cd_num); + _system->getAudioCDManager()->openCD(cd_num); } diff --git a/engines/toltecs/toltecs.h b/engines/toltecs/toltecs.h index 5d0f39be6a..e77a1bb52c 100644 --- a/engines/toltecs/toltecs.h +++ b/engines/toltecs/toltecs.h @@ -38,7 +38,6 @@ #include "sound/audiostream.h" #include "sound/mixer.h" #include "sound/decoders/voc.h" -#include "sound/audiocd.h" #include "engines/engine.h" |