aboutsummaryrefslogtreecommitdiff
path: root/engines/lilliput
diff options
context:
space:
mode:
Diffstat (limited to 'engines/lilliput')
-rw-r--r--engines/lilliput/lilliput.cpp2
-rw-r--r--engines/lilliput/script.cpp6
-rw-r--r--engines/lilliput/sound.cpp10
-rw-r--r--engines/lilliput/sound.h2
4 files changed, 9 insertions, 11 deletions
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index 0a842bf1f3..eaf3e5ffd4 100644
--- a/engines/lilliput/lilliput.cpp
+++ b/engines/lilliput/lilliput.cpp
@@ -1714,7 +1714,7 @@ byte LilliputEngine::sequenceSound(int index, Common::Point var1) {
debugC(2, kDebugEngine, "sequenceSound(%d, %d - %d)", index, var1.x, var1.y);
int param4x = ((index | 0xFF00) >> 8);
- _soundHandler->play(var1.y, _scriptHandler->_viewportPos,
+ _soundHandler->playSound(var1.y, _scriptHandler->_viewportPos,
_scriptHandler->_characterTilePos[index], Common::Point(param4x, 0));
return kSeqRepeat;
}
diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp
index f12105e96a..45b5f7fa7b 100644
--- a/engines/lilliput/script.cpp
+++ b/engines/lilliput/script.cpp
@@ -3288,7 +3288,7 @@ void LilliputScript::OC_playObjectSound() {
Common::Point var4 = Common::Point(0xFF, index & 0xFF);
int soundId = (_currScript->readUint16LE() & 0xFF);
- _vm->_soundHandler->play(soundId, _viewportPos, _characterTilePos[index], var4);
+ _vm->_soundHandler->playSound(soundId, _viewportPos, _characterTilePos[index], var4);
}
void LilliputScript::OC_startLocationSound() {
@@ -3299,7 +3299,7 @@ void LilliputScript::OC_startLocationSound() {
Common::Point var2 = _viewportPos;
int var1 = (_currScript->readUint16LE() & 0xFF);
- _vm->_soundHandler->play(var1, var2, var3, var4);
+ _vm->_soundHandler->playSound(var1, var2, var3, var4);
}
void LilliputScript::OC_stopObjectSound() {
@@ -3333,7 +3333,7 @@ void LilliputScript::OC_playMusic() {
warning("OC_playMusic: unknown value for var3");
Common::Point var3 = Common::Point(-1, -1);
- _vm->_soundHandler->play(var1, var2, var3, var4);
+ _vm->_soundHandler->playSound(var1, var2, var3, var4);
}
void LilliputScript::OC_stopMusic() {
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];
diff --git a/engines/lilliput/sound.h b/engines/lilliput/sound.h
index c547637f4d..ef7d2a9a3e 100644
--- a/engines/lilliput/sound.h
+++ b/engines/lilliput/sound.h
@@ -41,7 +41,7 @@ public:
void init();
void refresh();
- void play(int var1, Common::Point var2, Common::Point var3, Common::Point var4);
+ void playSound(int var1, Common::Point var2, Common::Point var3, Common::Point var4);
void stopSound(Common::Point pos);
void toggleOnOff();
void update();