aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorD G Turner2018-07-29 05:20:55 +0100
committerD G Turner2018-07-29 05:20:55 +0100
commitdd8e0036025a5f793a453cc3479d3ca6b43cf3ec (patch)
treed530cc5eb7e53b4e2eab4ba610f91c6d3d55bdaf /engines
parentbdb307634f192966536c8ded58d84cb4ad4ee8c2 (diff)
downloadscummvm-rg350-dd8e0036025a5f793a453cc3479d3ca6b43cf3ec.tar.gz
scummvm-rg350-dd8e0036025a5f793a453cc3479d3ca6b43cf3ec.tar.bz2
scummvm-rg350-dd8e0036025a5f793a453cc3479d3ca6b43cf3ec.zip
LILLIPUT: Fix Compiler Warning About Hiding Overloaded Virtual.
Diffstat (limited to 'engines')
-rw-r--r--engines/lilliput/script.cpp4
-rw-r--r--engines/lilliput/sound.cpp7
-rw-r--r--engines/lilliput/sound.h2
3 files changed, 7 insertions, 6 deletions
diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp
index cc78c31d37..f12105e96a 100644
--- a/engines/lilliput/script.cpp
+++ b/engines/lilliput/script.cpp
@@ -3307,7 +3307,7 @@ void LilliputScript::OC_stopObjectSound() {
Common::Point var4 = Common::Point(-1, getValue1() & 0xFF);
- _vm->_soundHandler->stop(var4); // Stop Sound
+ _vm->_soundHandler->stopSound(var4);
}
void LilliputScript::OC_stopLocationSound() {
@@ -3315,7 +3315,7 @@ void LilliputScript::OC_stopLocationSound() {
Common::Point var4 = getPosFromScript();
- _vm->_soundHandler->stop(var4);
+ _vm->_soundHandler->stopSound(var4);
}
void LilliputScript::OC_toggleSound() {
diff --git a/engines/lilliput/sound.cpp b/engines/lilliput/sound.cpp
index 47048e4117..4a67566f64 100644
--- a/engines/lilliput/sound.cpp
+++ b/engines/lilliput/sound.cpp
@@ -224,9 +224,10 @@ void LilliputSound::playMusic(int var1) {
}
}
-void LilliputSound::stop(Common::Point pos) {
- debugC(1, kDebugSound, "LilliputSound::stop(%d - %d)", pos.x, pos.y);
- warning("LilliputSound::stop(%d - %d)", pos.x, pos.y);
+void LilliputSound::stopSound(Common::Point pos) {
+ debugC(1, kDebugSound, "LilliputSound::stopSound(%d - %d)", pos.x, pos.y);
+ warning("LilliputSound::stopSound(%d - %d)", pos.x, pos.y);
+ // FIXME: Audio::MidiPlayer::stop() call required?
}
void LilliputSound::toggleOnOff() {
diff --git a/engines/lilliput/sound.h b/engines/lilliput/sound.h
index ebb49a8bc7..c547637f4d 100644
--- a/engines/lilliput/sound.h
+++ b/engines/lilliput/sound.h
@@ -42,7 +42,7 @@ public:
void init();
void refresh();
void play(int var1, Common::Point var2, Common::Point var3, Common::Point var4);
- void stop(Common::Point pos);
+ void stopSound(Common::Point pos);
void toggleOnOff();
void update();
void remove();