From e1abe47fbeeb277723a5a044c28a4acf990fac95 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 5 Dec 2010 14:04:50 +0000
Subject: TOLTECS: Reduced header dependencies and removed a TODO

---
 engines/toltecs/toltecs.cpp | 12 ------------
 engines/toltecs/toltecs.h   |  2 --
 2 files changed, 14 deletions(-)

(limited to 'engines/toltecs')

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,
-- 
cgit v1.2.3