diff options
| author | Strangerke | 2014-01-09 08:32:21 +0100 |
|---|---|---|
| committer | Strangerke | 2014-01-09 08:32:21 +0100 |
| commit | d19af62e6b5a00cd837502d4efede85e80588ff7 (patch) | |
| tree | 8b1fd9ad66d47a0cdd8cd0056dd4cc1a6deca5f6 /engines/mortevielle/sound.cpp | |
| parent | d8d4a2c3bb635151e3c044ab7b87496eb6854305 (diff) | |
| download | scummvm-rg350-d19af62e6b5a00cd837502d4efede85e80588ff7.tar.gz scummvm-rg350-d19af62e6b5a00cd837502d4efede85e80588ff7.tar.bz2 scummvm-rg350-d19af62e6b5a00cd837502d4efede85e80588ff7.zip | |
MORTEVIELLE: Get rid of setParent() in TextHandler and SoundManager
Diffstat (limited to 'engines/mortevielle/sound.cpp')
| -rw-r--r-- | engines/mortevielle/sound.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp index b670246726..c39c8e7024 100644 --- a/engines/mortevielle/sound.cpp +++ b/engines/mortevielle/sound.cpp @@ -55,7 +55,8 @@ namespace Mortevielle { const byte _tabdph[16] = {0, 10, 2, 0, 2, 10, 3, 0, 3, 7, 5, 0, 6, 7, 7, 10}; const byte _tabdbc[18] = {7, 23, 7, 14, 13, 9, 14, 9, 5, 12, 6, 12, 13, 4, 0, 4, 5, 9}; -SoundManager::SoundManager(Audio::Mixer *mixer) { +SoundManager::SoundManager(MortevielleEngine *vm, Audio::Mixer *mixer) { + _vm = vm; _mixer = mixer; _audioStream = nullptr; _ambiantNoiseBuf = nullptr; @@ -281,10 +282,6 @@ void SoundManager::playSong(const byte* buf, uint size, uint loops) { _mixer->stopHandle(songHandle); } -void SoundManager::setParent(MortevielleEngine *vm) { - _vm = vm; -} - void SoundManager::spfrac(int wor) { _queue[2]._rep = (uint)wor >> 12; if ((_soundType == 0) && (_queue[2]._code != 9)) { |