diff options
| author | Max Horn | 2009-05-28 22:02:45 +0000 |
|---|---|---|
| committer | Max Horn | 2009-05-28 22:02:45 +0000 |
| commit | 99b520dd09243a0aefcaf32f3e5640cff82586c8 (patch) | |
| tree | 1a93ff2497832eb2951243b831a5c529ca9f8cce /engines/sci/engine | |
| parent | 02ac46565b5086560cd842de416e53503da4ec49 (diff) | |
| download | scummvm-rg350-99b520dd09243a0aefcaf32f3e5640cff82586c8.tar.gz scummvm-rg350-99b520dd09243a0aefcaf32f3e5640cff82586c8.tar.bz2 scummvm-rg350-99b520dd09243a0aefcaf32f3e5640cff82586c8.zip | |
SCI: Merged SfxPlayer/NewPlayer code into sfx/core.cpp
svn-id: r40965
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/vm.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index 78b27794a6..8edf6f5186 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -25,7 +25,9 @@ #include "sci/sci.h" #include "sci/engine/state.h" -#include "sci/sfx/player.h" +//#include "sci/sfx/player.h" +#include "sci/sfx/iterator.h" +#include "sci/sfx/misc.h" #include "sci/engine/kernel.h" #include "sci/engine/vm.h" // for Object diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 42c1dd1705..ac0a32945b 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -35,7 +35,7 @@ #include "sci/engine/kernel_types.h" #include "sci/engine/seg_manager.h" #include "sci/engine/gc.h" -#include "sci/sfx/player.h" +#include "sci/sfx/misc.h" // for sfx_reset_player namespace Sci { |