diff options
author | Paul Gilbert | 2016-03-24 21:02:25 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-03-24 21:02:25 -0400 |
commit | c948e8812ebb619f22adb7794da6dcfb6d5d6b9e (patch) | |
tree | 8b87bcb0ceb513dcdd810dde682bf9c550e71251 /engines/titanic/sound | |
parent | fd78a874ccfdbc652241dc4402f6ca96ca188170 (diff) | |
download | scummvm-rg350-c948e8812ebb619f22adb7794da6dcfb6d5d6b9e.tar.gz scummvm-rg350-c948e8812ebb619f22adb7794da6dcfb6d5d6b9e.tar.bz2 scummvm-rg350-c948e8812ebb619f22adb7794da6dcfb6d5d6b9e.zip |
TITANIC: Support methods needed by CTelevision
Diffstat (limited to 'engines/titanic/sound')
-rw-r--r-- | engines/titanic/sound/sound.cpp | 17 | ||||
-rw-r--r-- | engines/titanic/sound/sound.h | 4 | ||||
-rw-r--r-- | engines/titanic/sound/sound_manager.cpp | 3 | ||||
-rw-r--r-- | engines/titanic/sound/sound_manager.h | 4 |
4 files changed, 25 insertions, 3 deletions
diff --git a/engines/titanic/sound/sound.cpp b/engines/titanic/sound/sound.cpp index 14dba2e152..b3b783d4c6 100644 --- a/engines/titanic/sound/sound.cpp +++ b/engines/titanic/sound/sound.cpp @@ -47,4 +47,21 @@ void CSound::preEnterView(CViewItem *newView, bool isNewRoom) { warning("CSound::preEnterView"); } +bool CSound::fn1(int val) { + if (val == 0 || val == -1) { + if (!_soundManager.proc14()) + return true; + } + + return false; +} + +void CSound::fn2(int val) { + warning("TODO: CSound::fn3"); +} + +void CSound::fn3(int val, int val2, int val3) { + warning("TODO: CSound::fn3"); +} + } // End of namespace Titanic z diff --git a/engines/titanic/sound/sound.h b/engines/titanic/sound/sound.h index 4c0dab5dd5..fe115f7237 100644 --- a/engines/titanic/sound/sound.h +++ b/engines/titanic/sound/sound.h @@ -72,6 +72,10 @@ public: * Called when the view has been changed */ void preEnterView(CViewItem *newView, bool isNewRoom); + + bool fn1(int val); + void fn2(int val); + void fn3(int val, int val2, int val3); }; } // End of namespace Titanic diff --git a/engines/titanic/sound/sound_manager.cpp b/engines/titanic/sound/sound_manager.cpp index 143dd8385f..f575411c82 100644 --- a/engines/titanic/sound/sound_manager.cpp +++ b/engines/titanic/sound/sound_manager.cpp @@ -81,8 +81,9 @@ void QSoundManager::proc13() { warning("TODO"); } -void QSoundManager::proc14() { +bool QSoundManager::proc14() { warning("TODO"); + return false; } int QSoundManager::proc15() { diff --git a/engines/titanic/sound/sound_manager.h b/engines/titanic/sound/sound_manager.h index 99513aefe8..29fbb5ad11 100644 --- a/engines/titanic/sound/sound_manager.h +++ b/engines/titanic/sound/sound_manager.h @@ -48,7 +48,7 @@ public: virtual void proc11() = 0; virtual void proc12() {} virtual void proc13() {} - virtual void proc14() = 0; + virtual bool proc14() = 0; virtual int proc15() const { return 0; } virtual int proc16() const { return 0; } virtual void WaveMixPump() {} @@ -111,7 +111,7 @@ public: virtual void proc11(); virtual void proc12(); virtual void proc13(); - virtual void proc14(); + virtual bool proc14(); virtual int proc15(); virtual int proc16(); virtual void WaveMixPump(); |