[Scummvm-cvs-logs] SF.net SVN: scummvm:[48086] scummvm/trunk/engines/sci

[fingolfin at users.sourceforge.net]

Revision: 48086
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48086&view=rev
Author:   fingolfin
Date:     2010-02-17 23:38:43 +0000 (Wed, 17 Feb 2010)

Log Message:
-----------
SCI: Reduce header interdependencies

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp
    scummvm/trunk/engines/sci/decompressor.cpp
    scummvm/trunk/engines/sci/decompressor.h
    scummvm/trunk/engines/sci/detection.cpp
    scummvm/trunk/engines/sci/engine/features.cpp
    scummvm/trunk/engines/sci/graphics/palette.cpp
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/sci/sound/audio.cpp
    scummvm/trunk/engines/sci/sound/drivers/adlib.cpp
    scummvm/trunk/engines/sci/sound/drivers/fb01.cpp
    scummvm/trunk/engines/sci/sound/drivers/midi.cpp
    scummvm/trunk/engines/sci/sound/drivers/mididriver.h
    scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp
    scummvm/trunk/engines/sci/sound/music.h

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/console.cpp	2010-02-17 23:38:43 UTC (rev 48086)
@@ -58,6 +58,7 @@
 #include "sci/video/vmd_decoder.h"
 #endif
 
+#include "common/file.h"
 #include "common/savefile.h"
 
 namespace Sci {

Modified: scummvm/trunk/engines/sci/decompressor.cpp
===================================================================
--- scummvm/trunk/engines/sci/decompressor.cpp	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/decompressor.cpp	2010-02-17 23:38:43 UTC (rev 48086)
@@ -28,6 +28,7 @@
 #include "common/util.h"
 #include "common/endian.h"
 #include "common/debug.h"
+#include "common/stream.h"
 
 #include "sci/decompressor.h"
 #include "sci/sci.h"

Modified: scummvm/trunk/engines/sci/decompressor.h
===================================================================
--- scummvm/trunk/engines/sci/decompressor.h	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/decompressor.h	2010-02-17 23:38:43 UTC (rev 48086)
@@ -26,8 +26,10 @@
 #ifndef SCI_DECOMPRESSOR_H
 #define SCI_DECOMPRESSOR_H
 
-#include "common/file.h"
+#include "common/scummsys.h"
 
+namespace Common { class ReadStream; }
+
 namespace Sci {
 
 enum ResourceCompression {

Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/detection.cpp	2010-02-17 23:38:43 UTC (rev 48086)
@@ -25,6 +25,7 @@
 
 #include "engines/advancedDetector.h"
 #include "base/plugins.h"
+#include "common/file.h"
 #include "common/savefile.h"
 #include "common/system.h"
 #include "graphics/thumbnail.h"

Modified: scummvm/trunk/engines/sci/engine/features.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/features.cpp	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/engine/features.cpp	2010-02-17 23:38:43 UTC (rev 48086)
@@ -28,6 +28,8 @@
 #include "sci/engine/selector.h"
 #include "sci/engine/vm.h"
 
+#include "common/file.h"
+
 namespace Sci {
 
 GameFeatures::GameFeatures(SegManager *segMan, Kernel *kernel) : _segMan(segMan), _kernel(kernel) {

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-02-17 23:38:43 UTC (rev 48086)
@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/file.h"
 #include "common/timer.h"
 #include "common/util.h"
 #include "common/system.h"

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-02-17 23:38:43 UTC (rev 48086)
@@ -25,8 +25,9 @@
 
 // Resource library
 
+#include "common/file.h"
+#include "common/debug.h"
 #include "common/util.h"
-#include "common/debug.h"
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"

Modified: scummvm/trunk/engines/sci/sound/audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/audio.cpp	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/sound/audio.cpp	2010-02-17 23:38:43 UTC (rev 48086)
@@ -30,6 +30,7 @@
 #include "sci/sound/audio.h"
 
 #include "common/system.h"
+#include "common/file.h"
 
 #include "sound/audiostream.h"
 #include "sound/audiocd.h"

Modified: scummvm/trunk/engines/sci/sound/drivers/adlib.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/adlib.cpp	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/sound/drivers/adlib.cpp	2010-02-17 23:38:43 UTC (rev 48086)
@@ -25,6 +25,8 @@
 
 #include "sci/sci.h"
 
+#include "common/file.h"
+
 #include "sound/fmopl.h"
 #include "sound/softsynth/emumidi.h"
 

Modified: scummvm/trunk/engines/sci/sound/drivers/fb01.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/fb01.cpp	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/sound/drivers/fb01.cpp	2010-02-17 23:38:43 UTC (rev 48086)
@@ -28,6 +28,9 @@
 #include "sci/resource.h"
 #include "sci/sound/drivers/mididriver.h"
 
+#include "common/file.h"
+#include "common/system.h"
+
 namespace Sci {
 
 static byte volumeTable[64] = {

Modified: scummvm/trunk/engines/sci/sound/drivers/midi.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/midi.cpp	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/sound/drivers/midi.cpp	2010-02-17 23:38:43 UTC (rev 48086)
@@ -26,6 +26,8 @@
 #include "sci/sci.h"
 
 #include "common/config-manager.h"
+#include "common/file.h"
+
 #include "sound/fmopl.h"
 #include "sound/softsynth/emumidi.h"
 

Modified: scummvm/trunk/engines/sci/sound/drivers/mididriver.h
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/mididriver.h	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/sound/drivers/mididriver.h	2010-02-17 23:38:43 UTC (rev 48086)
@@ -28,7 +28,6 @@
 
 #include "sci/sci.h"
 #include "sound/mididrv.h"
-#include "sound/softsynth/emumidi.h"
 #include "common/error.h"
 
 namespace Sci {

Modified: scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp	2010-02-17 23:38:43 UTC (rev 48086)
@@ -25,6 +25,8 @@
 
 #include "sci/sound/drivers/mididriver.h"
 
+#include "sound/softsynth/emumidi.h"
+
 namespace Sci {
 
 #define VOLUME_SHIFT 3

Modified: scummvm/trunk/engines/sci/sound/music.h
===================================================================
--- scummvm/trunk/engines/sci/sound/music.h	2010-02-17 23:37:59 UTC (rev 48085)
+++ scummvm/trunk/engines/sci/sound/music.h	2010-02-17 23:38:43 UTC (rev 48086)
@@ -26,14 +26,15 @@
 #ifndef SCI_MUSIC_H
 #define SCI_MUSIC_H
 
-#include "common/savefile.h"
+#ifndef USE_OLD_MUSIC_FUNCTIONS
 #include "common/serializer.h"
+#endif
 #include "common/mutex.h"
 
 #include "sound/mixer.h"
 #include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+//#include "sound/mididrv.h"
+//#include "sound/midiparser.h"
 
 #include "sci/sci.h"
 #include "sci/resource.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.