diff options
author | Paul Gilbert | 2012-11-11 19:54:48 +1100 |
---|---|---|
committer | Paul Gilbert | 2012-11-11 19:54:48 +1100 |
commit | 1844e4faa24bd31da89db49751ee80b201d061e9 (patch) | |
tree | 8621f22b9f7374d7363af30d3366bfbb8b9666ad /engines/hopkins/sound.h | |
parent | 0ef8703833c556ab8ace5db7abf7c7087a299587 (diff) | |
download | scummvm-rg350-1844e4faa24bd31da89db49751ee80b201d061e9.tar.gz scummvm-rg350-1844e4faa24bd31da89db49751ee80b201d061e9.tar.bz2 scummvm-rg350-1844e4faa24bd31da89db49751ee80b201d061e9.zip |
HOPKINS: Clean up of un-needed sound structure fields
Diffstat (limited to 'engines/hopkins/sound.h')
-rw-r--r-- | engines/hopkins/sound.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/hopkins/sound.h b/engines/hopkins/sound.h index 1e3b9925a6..88cecbbea7 100644 --- a/engines/hopkins/sound.h +++ b/engines/hopkins/sound.h @@ -45,7 +45,7 @@ public: bool _active; Audio::RewindableAudioStream *_audioStream; Audio::SoundHandle _soundHandle; - int field24; + bool freeSample; }; class MwavItem { @@ -55,18 +55,16 @@ public: Audio::SoundHandle _soundHandle; }; +#define MUSIC_WAVE_COUNT 50 + class MusicItem { public: bool _active; bool _isPlaying; Common::String _string; - int _mwavIndexes[50]; + int _mwavIndexes[MUSIC_WAVE_COUNT]; byte unused_mb[100]; int _currentIndex; - int fieldE0; - int fieldE4; - int fieldE8; - int fieldF0; }; class SoundItem { @@ -91,7 +89,7 @@ private: void PLAY_VOICE_SDL(); bool DEL_SAMPLE_SDL(int wavIndex); bool SDL_LoadVoice(const Common::String &filename, size_t fileOffset, size_t entryLength, SwavItem &item); - void LOAD_SAMPLE2_SDL(int wavIndex, const Common::String &filename, int field24); + void LOAD_SAMPLE2_SDL(int wavIndex, const Common::String &filename, bool freeSample); void LOAD_NWAV(const Common::String &file, int wavIndex); void PLAY_NWAV(int wavIndex); void DEL_NWAV(int wavIndex); |