diff options
| author | Filippos Karapetis | 2010-01-23 12:10:31 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-01-23 12:10:31 +0000 |
| commit | f007435b821ddb4797b580dcbee6c6d7bcec9ea6 (patch) | |
| tree | 6156bf1a628ced1162358aa799f5b6558a99646a | |
| parent | ed349aba0f4d4098742a0dba8c355cab91a720b2 (diff) | |
| download | scummvm-rg350-f007435b821ddb4797b580dcbee6c6d7bcec9ea6.tar.gz scummvm-rg350-f007435b821ddb4797b580dcbee6c6d7bcec9ea6.tar.bz2 scummvm-rg350-f007435b821ddb4797b580dcbee6c6d7bcec9ea6.zip | |
sfx_init_flags is not used in the new sound code
svn-id: r47464
| -rw-r--r-- | engines/sci/engine/state.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/state.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp index e61f61f9bf..96460ef69d 100644 --- a/engines/sci/engine/state.cpp +++ b/engines/sci/engine/state.cpp @@ -35,7 +35,9 @@ namespace Sci { EngineState::EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SegManager *segMan, SciGui *gui, AudioPlayer *audio) : resMan(res), _kernel(kernel), _voc(voc), _segMan(segMan), _gui(gui), _audio(audio), _dirseeker() { +#ifdef USE_OLD_MUSIC_FUNCTIONS sfx_init_flags = 0; +#endif restarting_flags = 0; diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h index a0b77adc8d..ace1f019aa 100644 --- a/engines/sci/engine/state.h +++ b/engines/sci/engine/state.h @@ -149,9 +149,9 @@ public: AudioPlayer *_audio; #ifdef USE_OLD_MUSIC_FUNCTIONS SfxState _sound; /**< sound subsystem */ + int sfx_init_flags; /**< flags the sfx subsystem was initialised with */ #endif SoundCommandParser *_soundCmd; - int sfx_init_flags; /**< flags the sfx subsystem was initialised with */ byte restarting_flags; /**< Flags used for restarting */ |