diff options
| author | Paul Gilbert | 2016-08-06 12:14:02 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-06 12:14:02 -0400 |
| commit | f0d208cdcf6e8fb8fc60ae3eddc62fc255fae2e4 (patch) | |
| tree | 078f3b879d844b955b030d27b03918620c907421 /engines/titanic/core | |
| parent | 139ad46410fe0a92a83eabd662caf2165eb498da (diff) | |
| download | scummvm-rg350-f0d208cdcf6e8fb8fc60ae3eddc62fc255fae2e4.tar.gz scummvm-rg350-f0d208cdcf6e8fb8fc60ae3eddc62fc255fae2e4.tar.bz2 scummvm-rg350-f0d208cdcf6e8fb8fc60ae3eddc62fc255fae2e4.zip | |
TITANIC: Added more sound manager methods
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/core/game_object.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 30366398c1..d7556c76ff 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -425,11 +425,11 @@ void CGameObject::makeDirty() { makeDirty(_bounds); } -bool CGameObject::soundFn1(int handle) { +bool CGameObject::isSoundActive(int handle) const { if (handle != 0 && handle != -1) { CGameManager *gameManager = getGameManager(); if (gameManager) - return gameManager->_sound.fn1(handle); + return gameManager->_sound.isActive(handle); } return false; diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index ec7f77cff6..ecef68ce70 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -195,7 +195,10 @@ protected: */ void stopSound(int handle, int val2 = 0); - bool soundFn1(int handle); + /** + * Returns true if a sound with the specified handle is active + */ + bool isSoundActive(int handle) const; void soundFn2(const CString &resName, int v1, int v2, int v3, int handleIndex); |