- Added volume param to KyraEngine::snd_playSoundEffect (0xFF per default as in original)

- Renamed KyraEngine_v3::playSoundEffect to KyraEngine_v3::snd_playSoundEffect
- Renamed KyraEngine_v3::playMusicTrack to KyraEngine_v3::snd_playWanderScoreViaMap
- Renamed KyraEngine_v3::o3_playMusicTrack to KyraEngine_v3::o3_playWanderScoreViaMap

svn-id: r31770

1 files changed, 5 insertions, 5 deletions

diff --git a/engines/kyra/sequences_v3.cpp b/engines/kyra/sequences_v3.cpp
index c2c25537b4..827d48d7ac 100644
--- a/engines/kyra/sequences_v3.cpp
+++ b/engines/kyra/sequences_v3.cpp
@@ -68,7 +68,7 @@ void KyraEngine_v3::showBadConscience() {
 	setupSceneAnimObject(0x0E, 9, 0, 187, -1, -1, -1, -1, 0, 0, 0, -1, animFilenames[anim]);
 	for (uint i = 0; i <= _badConscienceFrameTable[_badConscienceAnim]; ++i) {
 		if (i == 8)
-			playSoundEffect(0x1B, 0xC8);
+			snd_playSoundEffect(0x1B, 0xC8);
 		updateSceneAnim(0x0E, i);
 		delay(3*_tickLength, true);
 	}
@@ -98,7 +98,7 @@ void KyraEngine_v3::hideBadConscience() {
 	_badConscienceShown = false;
 	for (int frame = _badConscienceFrameTable[_badConscienceAnim+8]; frame >= 0; --frame) {
 		if (frame == 15)
-			playSoundEffect(0x31, 0xC8);
+			snd_playSoundEffect(0x31, 0xC8);
 		updateSceneAnim(0x0E, frame);
 		delay(1*_tickLength, true);
 	}
@@ -142,7 +142,7 @@ void KyraEngine_v3::showGoodConscience() {
 	setupSceneAnimObject(0x0F, 9, 0, 187, -1, -1, -1, -1, 0, 0, 0, -1, animFilenames[anim]);
 	for (uint i = 0; i <= _goodConscienceFrameTable[_goodConscienceAnim]; ++i) {
 		if (i == 10)
-			playSoundEffect(0x7F, 0xC8);
+			snd_playSoundEffect(0x7F, 0xC8);
 		updateSceneAnim(0x0F, i);
 		delay(2*_tickLength, true);
 	}
@@ -172,7 +172,7 @@ void KyraEngine_v3::hideGoodConscience() {
 	_goodConscienceShown = false;
 	for (int frame = _goodConscienceFrameTable[_goodConscienceAnim+5]; frame >= 0; --frame) {
 		if (frame == 17)
-			playSoundEffect(0x31, 0xC8);
+			snd_playSoundEffect(0x31, 0xC8);
 		updateSceneAnim(0x0F, frame);
 		delay(1*_tickLength, true);
 	}
@@ -246,7 +246,7 @@ void KyraEngine_v3::eelScript() {
 
 	setGameFlag(0xD1);
 
-	playSoundEffect(0x2A, 0xC8);
+	snd_playSoundEffect(0x2A, 0xC8);
 
 	setGameFlag(0x171);