diff options
| author | Johannes Schickel | 2008-03-21 16:18:27 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-03-21 16:18:27 +0000 |
| commit | a169619526c811f1718bbeb5ed980f68b9d2c8e7 (patch) | |
| tree | e419518022095bd4b43ec0de8a4d5e23c88bfe2f /engines/kyra/kyra_v2.h | |
| parent | 88069c943a6bd94da8d183f943200076d5638148 (diff) | |
| download | scummvm-rg350-a169619526c811f1718bbeb5ed980f68b9d2c8e7.tar.gz scummvm-rg350-a169619526c811f1718bbeb5ed980f68b9d2c8e7.tar.bz2 scummvm-rg350-a169619526c811f1718bbeb5ed980f68b9d2c8e7.zip | |
- Implemented opcode 97: o2_isAnySoundPlaying
- reworked sound channel handling in HoF
=> fixed some voice related bugs
svn-id: r31209
Diffstat (limited to 'engines/kyra/kyra_v2.h')
| -rw-r--r-- | engines/kyra/kyra_v2.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index cfd11a425d..ac6e5a3628 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -158,12 +158,6 @@ struct NestedSequence { uint16 finalCommand; }; -enum kMusicDataID { - kMusicIntro = 0, - kMusicIngame, - kMusicFinale -}; - class KyraEngine_v2 : public KyraEngine { friend class Debugger_v2; friend class TextDisplayer_v2; @@ -1036,6 +1030,7 @@ protected: int o2_setCauldronState(ScriptState *script); int o2_showItemString(ScriptState *script); int o2_getRand(ScriptState *script); + int o2_isAnySoundPlaying(ScriptState *script); int o2_setDeathHandlerFlag(ScriptState *script); int o2_setDrawNoShapeFlag(ScriptState *script); int o2_setRunFlag(ScriptState *script); |