diff options
| author | Max Horn | 2010-02-15 00:20:53 +0000 |
|---|---|---|
| committer | Max Horn | 2010-02-15 00:20:53 +0000 |
| commit | 975dbef0e58289a81cd55cf43304e5e20114a876 (patch) | |
| tree | 096597a17b3be6f19c3e64c4c589ac43ef5508b1 /engines/sci | |
| parent | 384acffeb153d631b701de418c753503770f1b14 (diff) | |
| download | scummvm-rg350-975dbef0e58289a81cd55cf43304e5e20114a876.tar.gz scummvm-rg350-975dbef0e58289a81cd55cf43304e5e20114a876.tar.bz2 scummvm-rg350-975dbef0e58289a81cd55cf43304e5e20114a876.zip | |
SCI: Remove sound/audio.h include from engine/state.h
svn-id: r48063
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/engine/game.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/engine/state.h | 1 | ||||
| -rw-r--r-- | engines/sci/sound/audio.h | 1 | ||||
| -rw-r--r-- | engines/sci/sound/soundcmd.cpp | 1 |
5 files changed, 4 insertions, 1 deletions
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp index db77724a57..b48ec13448 100644 --- a/engines/sci/engine/game.cpp +++ b/engines/sci/engine/game.cpp @@ -37,6 +37,7 @@ #include "sci/engine/message.h" #include "sci/graphics/gui.h" #include "sci/graphics/menu.h" +#include "sci/sound/audio.h" #include "sci/sound/music.h" namespace Sci { diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index caf9f6bcff..2d597fdc3f 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -28,6 +28,7 @@ #include "sci/engine/state.h" #include "sci/engine/kernel.h" #include "sci/engine/vm.h" // for Object +#include "sci/sound/audio.h" #include "sci/sound/soundcmd.h" #include "sound/mixer.h" diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h index 7f5d3cb8c1..7284f83319 100644 --- a/engines/sci/engine/state.h +++ b/engines/sci/engine/state.h @@ -40,7 +40,6 @@ namespace Common { #include "sci/parser/vocabulary.h" -#include "sci/sound/audio.h" #ifdef USE_OLD_MUSIC_FUNCTIONS #include "sci/sound/iterator/core.h" #endif diff --git a/engines/sci/sound/audio.h b/engines/sci/sound/audio.h index bab7dbb969..9fc3cbac51 100644 --- a/engines/sci/sound/audio.h +++ b/engines/sci/sound/audio.h @@ -27,6 +27,7 @@ #ifndef SCI_AUDIO_H #define SCI_AUDIO_H +#include "sci/engine/vm_types.h" #include "sound/mixer.h" namespace Sci { diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp index 214180fafd..20bce575f5 100644 --- a/engines/sci/sound/soundcmd.cpp +++ b/engines/sci/sound/soundcmd.cpp @@ -30,6 +30,7 @@ #endif #include "common/config-manager.h" +#include "sci/sound/audio.h" #include "sci/sound/music.h" #include "sci/sound/soundcmd.h" |