aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-06 18:54:00 -0400
committerPaul Gilbert2016-08-06 18:54:00 -0400
commit7b5b06f9d3618df3b3b9b02c8e4e2a9c897b76da (patch)
tree8016e149313de227ecf12729fdad2b5e206c1d36 /engines/titanic/core
parent551048118cca489eab17e71025c29fbd56ff7b82 (diff)
downloadscummvm-rg350-7b5b06f9d3618df3b3b9b02c8e4e2a9c897b76da.tar.gz
scummvm-rg350-7b5b06f9d3618df3b3b9b02c8e4e2a9c897b76da.tar.bz2
scummvm-rg350-7b5b06f9d3618df3b3b9b02c8e4e2a9c897b76da.zip
TITANIC: Added more sound manager methods, field renames in CProximity
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object.cpp6
-rw-r--r--engines/titanic/core/game_object.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index d7556c76ff..a366f7f336 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -634,11 +634,11 @@ void CGameObject::loadSound(const CString &name) {
}
}
-int CGameObject::playSound(const CString &name, int val2, int val3, int val4) {
+int CGameObject::playSound(const CString &name, uint volume, int val3, bool repeated) {
CProximity prox;
- prox._field8 = val2;
+ prox._channelVolume = volume;
prox._fieldC = val3;
- prox._field20 = val4;
+ prox._repeated = repeated;
return playSound(name, prox);
}
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index ecef68ce70..e5ee22a8d5 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -183,7 +183,7 @@ protected:
/**
* Plays a sound
*/
- int playSound(const CString &name, int val2 = 100, int val3 = 0, int val4 = 0);
+ int playSound(const CString &name, uint volume = 100, int val3 = 0, bool repeated = false);
/**
* Plays a sound