aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-12-05 13:56:52 +0000
committerWillem Jan Palenstijn2011-11-20 22:43:10 +0100
commit4cc5934d840fb495ff7543c01ff053044f3fa64f (patch)
treedfc39a8cfa52f98b432e762fea8d9327215858d6
parente1f795fb6d5fc3b8e7b8f9130561bf4d2afe4b2d (diff)
downloadscummvm-rg350-4cc5934d840fb495ff7543c01ff053044f3fa64f.tar.gz
scummvm-rg350-4cc5934d840fb495ff7543c01ff053044f3fa64f.tar.bz2
scummvm-rg350-4cc5934d840fb495ff7543c01ff053044f3fa64f.zip
TOLTECS: Reduced header dependencies
-rw-r--r--engines/toltecs/movie.cpp9
-rw-r--r--engines/toltecs/movie.h1
-rw-r--r--engines/toltecs/script.cpp9
-rw-r--r--engines/toltecs/sound.h2
4 files changed, 3 insertions, 18 deletions
diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp
index 0da981be0f..ba6771b864 100644
--- a/engines/toltecs/movie.cpp
+++ b/engines/toltecs/movie.cpp
@@ -21,15 +21,6 @@
*
*/
-#include "common/events.h"
-#include "common/keyboard.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/config-manager.h"
-
-#include "base/plugins.h"
-#include "base/version.h"
-
#include "sound/mixer.h"
#include "sound/decoders/raw.h"
diff --git a/engines/toltecs/movie.h b/engines/toltecs/movie.h
index 46c2384f98..38eafb111a 100644
--- a/engines/toltecs/movie.h
+++ b/engines/toltecs/movie.h
@@ -25,6 +25,7 @@
#define TOLTECS_MOVIE_H
#include "sound/audiostream.h"
+#include "sound/mixer.h" // for Audio::SoundHandle
namespace Toltecs {
diff --git a/engines/toltecs/script.cpp b/engines/toltecs/script.cpp
index 36a98ad2a3..6ec285603d 100644
--- a/engines/toltecs/script.cpp
+++ b/engines/toltecs/script.cpp
@@ -23,14 +23,6 @@
// TODO: Clean up game variable handling and move it to ToltecsEngine
-#include "common/events.h"
-#include "common/keyboard.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/config-manager.h"
-
-#include "sound/mixer.h"
-
#include "toltecs/toltecs.h"
#include "toltecs/animation.h"
#include "toltecs/menu.h"
@@ -38,7 +30,6 @@
#include "toltecs/palette.h"
#include "toltecs/resource.h"
#include "toltecs/script.h"
-#include "toltecs/screen.h"
#include "toltecs/segmap.h"
#include "toltecs/sound.h"
diff --git a/engines/toltecs/sound.h b/engines/toltecs/sound.h
index 2514d4fa20..381c7d3fa6 100644
--- a/engines/toltecs/sound.h
+++ b/engines/toltecs/sound.h
@@ -24,6 +24,8 @@
#ifndef TOLTECS_SOUND_H
#define TOLTECS_SOUND_H
+#include "sound/mixer.h" // for Audio::SoundHandle
+
#include "toltecs/toltecs.h"
namespace Toltecs {