[Scummvm-git-logs] scummvm master -> 8f1e1bdd8cf11c3e26ca2471457f2444b9afefb5
digitall
dgturner at iee.org
Sun Jul 29 06:23:54 CEST 2018
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
dd8e003602 LILLIPUT: Fix Compiler Warning About Hiding Overloaded Virtual.
8f1e1bdd8c LILLIPUT: Minor Sound Function Name Change For Consistency.
Commit: dd8e0036025a5f793a453cc3479d3ca6b43cf3ec
https://github.com/scummvm/scummvm/commit/dd8e0036025a5f793a453cc3479d3ca6b43cf3ec
Author: D G Turner (digitall at scummvm.org)
Date: 2018-07-29T05:20:55+01:00
Commit Message:
LILLIPUT: Fix Compiler Warning About Hiding Overloaded Virtual.
Changed paths:
engines/lilliput/script.cpp
engines/lilliput/sound.cpp
engines/lilliput/sound.h
diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp
index cc78c31..f12105e 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 47048e4..4a67566 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 ebb49a8..c547637 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();
Commit: 8f1e1bdd8cf11c3e26ca2471457f2444b9afefb5
https://github.com/scummvm/scummvm/commit/8f1e1bdd8cf11c3e26ca2471457f2444b9afefb5
Author: D G Turner (digitall at scummvm.org)
Date: 2018-07-29T05:30:37+01:00
Commit Message:
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.
Changed paths:
engines/lilliput/lilliput.cpp
engines/lilliput/script.cpp
engines/lilliput/sound.cpp
engines/lilliput/sound.h
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index 0a842bf..eaf3e5f 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 f12105e..45b5f7f 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 4a67566..4dd8128 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 c547637..ef7d2a9 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();
More information about the Scummvm-git-logs
mailing list