diff options
-rw-r--r-- | engines/sci/console.cpp | 1 | ||||
-rw-r--r-- | engines/sci/decompressor.cpp | 1 | ||||
-rw-r--r-- | engines/sci/decompressor.h | 4 | ||||
-rw-r--r-- | engines/sci/detection.cpp | 1 | ||||
-rw-r--r-- | engines/sci/engine/features.cpp | 2 | ||||
-rw-r--r-- | engines/sci/graphics/palette.cpp | 1 | ||||
-rw-r--r-- | engines/sci/resource.cpp | 3 | ||||
-rw-r--r-- | engines/sci/sound/audio.cpp | 1 | ||||
-rw-r--r-- | engines/sci/sound/drivers/adlib.cpp | 2 | ||||
-rw-r--r-- | engines/sci/sound/drivers/fb01.cpp | 3 | ||||
-rw-r--r-- | engines/sci/sound/drivers/midi.cpp | 2 | ||||
-rw-r--r-- | engines/sci/sound/drivers/mididriver.h | 1 | ||||
-rw-r--r-- | engines/sci/sound/drivers/pcjr.cpp | 2 | ||||
-rw-r--r-- | engines/sci/sound/music.h | 7 |
14 files changed, 25 insertions, 6 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index c568aa6b49..a688001793 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -58,6 +58,7 @@ #include "sci/video/vmd_decoder.h" #endif +#include "common/file.h" #include "common/savefile.h" namespace Sci { diff --git a/engines/sci/decompressor.cpp b/engines/sci/decompressor.cpp index 7d5064fca2..3d978eb94b 100644 --- a/engines/sci/decompressor.cpp +++ b/engines/sci/decompressor.cpp @@ -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" diff --git a/engines/sci/decompressor.h b/engines/sci/decompressor.h index ed363621e8..90065927f5 100644 --- a/engines/sci/decompressor.h +++ b/engines/sci/decompressor.h @@ -26,7 +26,9 @@ #ifndef SCI_DECOMPRESSOR_H #define SCI_DECOMPRESSOR_H -#include "common/file.h" +#include "common/scummsys.h" + +namespace Common { class ReadStream; } namespace Sci { diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 768f514804..b36c183895 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -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" diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp index 23247d65f8..83358684fa 100644 --- a/engines/sci/engine/features.cpp +++ b/engines/sci/engine/features.cpp @@ -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) { diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index 0294c21c0c..b50bf49b4b 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -23,6 +23,7 @@ * */ +#include "common/file.h" #include "common/timer.h" #include "common/util.h" #include "common/system.h" diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 0eec195214..a5569555e9 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -25,8 +25,9 @@ // Resource library -#include "common/util.h" +#include "common/file.h" #include "common/debug.h" +#include "common/util.h" #include "sci/sci.h" #include "sci/engine/state.h" diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp index 4643448dc4..9502b279ae 100644 --- a/engines/sci/sound/audio.cpp +++ b/engines/sci/sound/audio.cpp @@ -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" diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp index fa5e2c5697..a8733dc0a2 100644 --- a/engines/sci/sound/drivers/adlib.cpp +++ b/engines/sci/sound/drivers/adlib.cpp @@ -25,6 +25,8 @@ #include "sci/sci.h" +#include "common/file.h" + #include "sound/fmopl.h" #include "sound/softsynth/emumidi.h" diff --git a/engines/sci/sound/drivers/fb01.cpp b/engines/sci/sound/drivers/fb01.cpp index 2a9f9b1239..7e9fbd51a1 100644 --- a/engines/sci/sound/drivers/fb01.cpp +++ b/engines/sci/sound/drivers/fb01.cpp @@ -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] = { diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp index 4150ae7ce7..2432a8fab0 100644 --- a/engines/sci/sound/drivers/midi.cpp +++ b/engines/sci/sound/drivers/midi.cpp @@ -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" diff --git a/engines/sci/sound/drivers/mididriver.h b/engines/sci/sound/drivers/mididriver.h index a3f9c7302a..12d3e57f5d 100644 --- a/engines/sci/sound/drivers/mididriver.h +++ b/engines/sci/sound/drivers/mididriver.h @@ -28,7 +28,6 @@ #include "sci/sci.h" #include "sound/mididrv.h" -#include "sound/softsynth/emumidi.h" #include "common/error.h" namespace Sci { diff --git a/engines/sci/sound/drivers/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp index e9204d0c72..420007b698 100644 --- a/engines/sci/sound/drivers/pcjr.cpp +++ b/engines/sci/sound/drivers/pcjr.cpp @@ -25,6 +25,8 @@ #include "sci/sound/drivers/mididriver.h" +#include "sound/softsynth/emumidi.h" + namespace Sci { #define VOLUME_SHIFT 3 diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h index 9f4bb1ce07..be935280b6 100644 --- a/engines/sci/sound/music.h +++ b/engines/sci/sound/music.h @@ -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" |