aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound/sound.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-04 21:21:34 -0400
committerPaul Gilbert2016-08-04 21:21:34 -0400
commit23e387fb9086f9fdf2d15c01f29907f1fd593d29 (patch)
tree5ad9a98b26a721f2511ae7d39f3d008d717771b8 /engines/titanic/sound/sound.cpp
parentb74ec1df8938668b67d54dab44d0a1f96e9de490 (diff)
downloadscummvm-rg350-23e387fb9086f9fdf2d15c01f29907f1fd593d29.tar.gz
scummvm-rg350-23e387fb9086f9fdf2d15c01f29907f1fd593d29.tar.bz2
scummvm-rg350-23e387fb9086f9fdf2d15c01f29907f1fd593d29.zip
TITANIC: Rename WaveFile to CWaveFile for consistency
Diffstat (limited to 'engines/titanic/sound/sound.cpp')
-rw-r--r--engines/titanic/sound/sound.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/sound/sound.cpp b/engines/titanic/sound/sound.cpp
index e8084d79e0..40f5c4335e 100644
--- a/engines/titanic/sound/sound.cpp
+++ b/engines/titanic/sound/sound.cpp
@@ -71,7 +71,7 @@ void CSound::fn3(int handle, int val2, int val3) {
warning("TODO: CSound::fn3");
}
-void CSound::fn4(WaveFile *waveFile, int val) {
+void CSound::fn4(CWaveFile *waveFile, int val) {
// TODO
}
@@ -99,11 +99,11 @@ void CSound::removeOldest() {
}
}
-WaveFile *CSound::getTrueTalkSound(CDialogueFile *dialogueFile, int index) {
+CWaveFile *CSound::getTrueTalkSound(CDialogueFile *dialogueFile, int index) {
return loadSpeech(dialogueFile, index);
}
-WaveFile *CSound::loadSound(const CString &name) {
+CWaveFile *CSound::loadSound(const CString &name) {
checkSounds();
// Check whether an entry for the given name is already active
@@ -139,7 +139,7 @@ WaveFile *CSound::loadSound(const CString &name) {
}
int CSound::playSound(const CString &name, CProximity &prox) {
- WaveFile *waveFile = loadSound(name);
+ CWaveFile *waveFile = loadSound(name);
if (!waveFile)
return -1;
@@ -149,7 +149,7 @@ int CSound::playSound(const CString &name, CProximity &prox) {
return _soundManager.playSound(*waveFile, prox);
}
-WaveFile *CSound::loadSpeech(CDialogueFile *dialogueFile, int speechId) {
+CWaveFile *CSound::loadSpeech(CDialogueFile *dialogueFile, int speechId) {
checkSounds();
// Check whether an entry for the given name is already active
@@ -186,7 +186,7 @@ WaveFile *CSound::loadSpeech(CDialogueFile *dialogueFile, int speechId) {
}
int CSound::playSpeech(CDialogueFile *dialogueFile, int speechId, CProximity &prox) {
- WaveFile *waveFile = loadSpeech(dialogueFile, speechId);
+ CWaveFile *waveFile = loadSpeech(dialogueFile, speechId);
if (!waveFile)
return -1;