aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-09 19:03:05 -0400
committerPaul Gilbert2016-08-09 19:03:05 -0400
commit30936a6115160e8e79b3c768c2ee97aae9cbd554 (patch)
tree58c0b3a9062078e835d6ccf20f0c239b3e719b1d /engines/titanic/core
parent0f1fd5c9553fa0db01ceb12f7d315cead6ab2a64 (diff)
downloadscummvm-rg350-30936a6115160e8e79b3c768c2ee97aae9cbd554.tar.gz
scummvm-rg350-30936a6115160e8e79b3c768c2ee97aae9cbd554.tar.bz2
scummvm-rg350-30936a6115160e8e79b3c768c2ee97aae9cbd554.zip
TITANIC: Finish CMusicPlayer class
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object.cpp2
-rw-r--r--engines/titanic/core/game_object.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 95ebe6a1e7..e0a4903f75 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -487,7 +487,7 @@ void CGameObject::playGlobalSound(const CString &resName, int mode, bool initial
sound.setVolume(_soundHandles[handleIndex], newVolume, 2);
}
-void CGameObject::setSoundVolume(uint handle, uint percent, uint seconds) {
+void CGameObject::setSoundVolume(int handle, uint percent, uint seconds) {
if (handle != 0 && handle != -1) {
CGameManager *gameManager = getGameManager();
if (gameManager)
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 322b62636c..19eb296965 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -220,7 +220,7 @@ protected:
* @param volume Volume percentage (0 to 100)
* @param seconds Number of seconds to transition to the new volume
*/
- void setSoundVolume(uint handle, uint percent, uint seconds);
+ void setSoundVolume(int handle, uint percent, uint seconds);
/**
* Plays a sound, and saves it's handle in the global sound handles list