diff options
| author | Paul Gilbert | 2016-09-18 10:22:49 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-09-18 10:22:49 -0400 |
| commit | a39da343b7dd0ea69c481c3f0a5346a9134ae736 (patch) | |
| tree | 95a738f2e4500982900a5fcd156564d62edef6c1 /engines/xeen/music.h | |
| parent | 2bec9c5a0cfc9f339ce04460c9d6bd3b8633f1b2 (diff) | |
| download | scummvm-rg350-a39da343b7dd0ea69c481c3f0a5346a9134ae736.tar.gz scummvm-rg350-a39da343b7dd0ea69c481c3f0a5346a9134ae736.tar.bz2 scummvm-rg350-a39da343b7dd0ea69c481c3f0a5346a9134ae736.zip | |
XEEN: Support switching between fx & game music, fx fixes
Diffstat (limited to 'engines/xeen/music.h')
| -rw-r--r-- | engines/xeen/music.h | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/engines/xeen/music.h b/engines/xeen/music.h index 1182be4377..d675a37d08 100644 --- a/engines/xeen/music.h +++ b/engines/xeen/music.h @@ -91,7 +91,7 @@ private: bool command(const byte *&srcP); protected: Common::Array<Channel> _channels; - int _exclude7; + bool _exclude7; bool _musicPlaying; bool _fxPlaying; protected: @@ -136,6 +136,11 @@ protected: * Post-processing done when a pause countdown starts or is in progress */ virtual void pausePostProcess() = 0; + + /** + * Does a reset of any sound effect + */ + virtual void resetFX() = 0; public: /** * Constructor @@ -153,9 +158,9 @@ public: virtual void playFX(uint effectId, const byte *data); /** - * Does a reset of any sound effect + * Stop any playing FX */ - virtual void stopFX() = 0; + void stopFX(); /** * Plays a song @@ -262,6 +267,11 @@ protected: * Post-processing done when a pause countdown starts or is in progress */ virtual void pausePostProcess(); + + /** + * Does a reset of any sound effect + */ + virtual void resetFX(); public: /** * Constructor @@ -279,11 +289,6 @@ public: virtual void playFX(uint effectId, const byte *data); /** - * Does a reset of any sound effect - */ - virtual void stopFX(); - - /** * Plays a song */ virtual void playSong(const byte *data); @@ -322,6 +327,11 @@ public: void playFX(uint effectId); /** + * Stops any currently playing FX + */ + void stopFX(); + + /** * Executes special music command */ int songCommand(uint commandId, byte volume = 0); |