aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-12-05 14:04:50 +0000
committerWillem Jan Palenstijn2011-11-20 22:43:10 +0100
commite1abe47fbeeb277723a5a044c28a4acf990fac95 (patch)
tree1623a9ca36a6e85c8cd69c2db35efc7483f04efe
parent4cc5934d840fb495ff7543c01ff053044f3fa64f (diff)
downloadscummvm-rg350-e1abe47fbeeb277723a5a044c28a4acf990fac95.tar.gz
scummvm-rg350-e1abe47fbeeb277723a5a044c28a4acf990fac95.tar.bz2
scummvm-rg350-e1abe47fbeeb277723a5a044c28a4acf990fac95.zip
TOLTECS: Reduced header dependencies and removed a TODO
-rw-r--r--engines/toltecs/toltecs.cpp12
-rw-r--r--engines/toltecs/toltecs.h2
2 files changed, 0 insertions, 14 deletions
diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp
index ae5e17cae4..2092d034bc 100644
--- a/engines/toltecs/toltecs.cpp
+++ b/engines/toltecs/toltecs.cpp
@@ -21,25 +21,18 @@
*
*/
-#include "common/events.h"
#include "common/EventRecorder.h"
-#include "common/keyboard.h"
-#include "common/file.h"
-#include "common/savefile.h"
#include "common/config-manager.h"
#include "common/str.h"
#include "base/plugins.h"
#include "base/version.h"
-#include "graphics/surface.h"
#include "graphics/cursorman.h"
-#include "graphics/primitives.h"
#include "engines/util.h"
#include "sound/mixer.h"
-#include "backends/audiocd/audiocd.h"
#include "toltecs/toltecs.h"
#include "toltecs/animation.h"
@@ -72,11 +65,6 @@ ToltecsEngine::ToltecsEngine(OSystem *syst, const ToltecsGameDescription *gameDe
_rnd = new Common::RandomSource();
g_eventRec.registerRandomSource(*_rnd, "toltecs");
-
- int cd_num = ConfMan.getInt("cdrom");
- if (cd_num >= 0)
- _system->getAudioCDManager()->openCD(cd_num);
-
}
ToltecsEngine::~ToltecsEngine() {
diff --git a/engines/toltecs/toltecs.h b/engines/toltecs/toltecs.h
index 24e7f166d3..38a8952bcc 100644
--- a/engines/toltecs/toltecs.h
+++ b/engines/toltecs/toltecs.h
@@ -51,8 +51,6 @@ class Screen;
class SegmentMap;
class Sound;
-// TODO/FIXME: The includes of the Toltecs engine need serious clean-up
-
enum SysString {
kStrLoadingPleaseWait,
kStrWhatCanIDoForYou,