diff options
Diffstat (limited to 'engines/titanic/sound')
-rw-r--r-- | engines/titanic/sound/music_room.cpp | 5 | ||||
-rw-r--r-- | engines/titanic/sound/music_room.h | 5 | ||||
-rw-r--r-- | engines/titanic/sound/sound.cpp | 8 | ||||
-rw-r--r-- | engines/titanic/sound/sound.h | 5 | ||||
-rw-r--r-- | engines/titanic/sound/sound_manager.h | 6 |
5 files changed, 28 insertions, 1 deletions
diff --git a/engines/titanic/sound/music_room.cpp b/engines/titanic/sound/music_room.cpp index 2b959a0847..593c572277 100644 --- a/engines/titanic/sound/music_room.cpp +++ b/engines/titanic/sound/music_room.cpp @@ -21,6 +21,7 @@ */ #include "titanic/sound/music_room.h" +#include "common/textconsole.h" namespace Titanic { @@ -28,4 +29,8 @@ CMusicRoom::CMusicRoom(CGameManager *gameManager) : _gameManager(gameManager) { } +void CMusicRoom::preLoad() { + warning("TODO: CMusicRoom::preLoad"); +} + } // End of namespace Titanic diff --git a/engines/titanic/sound/music_room.h b/engines/titanic/sound/music_room.h index 7fcd99db1e..ce262a2b99 100644 --- a/engines/titanic/sound/music_room.h +++ b/engines/titanic/sound/music_room.h @@ -32,6 +32,11 @@ public: CGameManager *_gameManager; public: CMusicRoom(CGameManager *owner); + + /** + * Called when a game is about to be loaded + */ + void preLoad(); }; } // End of namespace Titanic diff --git a/engines/titanic/sound/sound.cpp b/engines/titanic/sound/sound.cpp index 35c1c708a6..062e43debc 100644 --- a/engines/titanic/sound/sound.cpp +++ b/engines/titanic/sound/sound.cpp @@ -21,6 +21,7 @@ */ #include "titanic/sound/sound.h" +#include "titanic/game_manager.h" namespace Titanic { @@ -35,4 +36,11 @@ void CSound::load(SimpleFile *file) { _soundManager.load(file); } +void CSound::preLoad() { + _soundManager.preLoad(); + + if (_gameManager) + _gameManager->_musicRoom.preLoad(); +} + } // End of namespace Titanic z diff --git a/engines/titanic/sound/sound.h b/engines/titanic/sound/sound.h index a78bc79741..1b98507a93 100644 --- a/engines/titanic/sound/sound.h +++ b/engines/titanic/sound/sound.h @@ -48,6 +48,11 @@ public: void load(SimpleFile *file); /** + * Called when a game is about to be loaded + */ + void preLoad(); + + /** * Called when loading a game is complete */ void postLoad() { _soundManager.postLoad(); } diff --git a/engines/titanic/sound/sound_manager.h b/engines/titanic/sound/sound_manager.h index cb88b6684c..6a2e5a79d3 100644 --- a/engines/titanic/sound/sound_manager.h +++ b/engines/titanic/sound/sound_manager.h @@ -57,7 +57,11 @@ public: virtual void proc20(int v) { _field8 = v; } virtual void proc21(int v) { _fieldC = v; } virtual void proc22(int v) { _field10 = v; } - virtual void proc23() { proc10(); } + + /** + * Called when a game is about to be loaded + */ + virtual void preLoad() { proc10(); } /** * Load the data for the class from file |