aboutsummaryrefslogtreecommitdiff
path: root/engines/lilliput/sound.cpp
diff options
context:
space:
mode:
authorD G Turner2018-07-29 05:30:37 +0100
committerD G Turner2018-07-29 05:30:37 +0100
commit8f1e1bdd8cf11c3e26ca2471457f2444b9afefb5 (patch)
tree6ec330022ef9ca49f2281d982ca9982d613c2b61 /engines/lilliput/sound.cpp
parentdd8e0036025a5f793a453cc3479d3ca6b43cf3ec (diff)
downloadscummvm-rg350-8f1e1bdd8cf11c3e26ca2471457f2444b9afefb5.tar.gz
scummvm-rg350-8f1e1bdd8cf11c3e26ca2471457f2444b9afefb5.tar.bz2
scummvm-rg350-8f1e1bdd8cf11c3e26ca2471457f2444b9afefb5.zip
LILLIPUT: Minor Sound Function Name Change For Consistency.
This has no functional change, but improves the consistency with the renamed stopSound() function. Also, minor fixes for formatting, removal of redundant comments and code in sound class.
Diffstat (limited to 'engines/lilliput/sound.cpp')
-rw-r--r--engines/lilliput/sound.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/lilliput/sound.cpp b/engines/lilliput/sound.cpp
index 4a67566f64..4dd8128b6d 100644
--- a/engines/lilliput/sound.cpp
+++ b/engines/lilliput/sound.cpp
@@ -168,7 +168,6 @@ void LilliputSound::sendToChannel(byte channel, uint32 b) {
_channelsTable[channel]->send(b);
}
-// Used during initialization
void LilliputSound::init() {
debugC(1, kDebugSound, "LilliputSound::init()");
@@ -179,9 +178,9 @@ void LilliputSound::refresh() {
debugC(1, kDebugSound, "LilliputSound::refresh()");
}
-void LilliputSound::play(int var1, Common::Point var2, Common::Point var3, Common::Point var4) {
- debugC(1, kDebugSound, "LilliputSound::play(%d, %d - %d, %d - %d, %d - %d)", var1, var2.x, var2.y, var3.x, var3.y, var4.x, var4.y);
- // warning("LilliputSound::play(%d, %d - %d, %d - %d, %d - %d)", var1, var2.x, var2.y, var3.x, var3.y, var4.x, var4.y);
+void LilliputSound::playSound(int var1, Common::Point var2, Common::Point var3, Common::Point var4) {
+ debugC(1, kDebugSound, "LilliputSound::playSound(%d, %d - %d, %d - %d, %d - %d)", var1, var2.x, var2.y, var3.x, var3.y, var4.x, var4.y);
+ // warning("LilliputSound::playSound(%d, %d - %d, %d - %d, %d - %d)", var1, var2.x, var2.y, var3.x, var3.y, var4.x, var4.y);
// save camera (var2)
if (_aliasArr[var1] == 0xFF) {
@@ -195,9 +194,8 @@ void LilliputSound::play(int var1, Common::Point var2, Common::Point var3, Commo
} else {
warning("longterm");
}
-
- return;
}
+
void LilliputSound::playMusic(int var1) {
int idx = _aliasArr[var1];
bool loop = _loopArr[var1];