- 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/script_v3.cpp b/engines/kyra/script_v3.cpp
index a2f5c28978..c15a49b89a 100644
--- a/engines/kyra/script_v3.cpp
+++ b/engines/kyra/script_v3.cpp
@@ -885,15 +885,15 @@ int KyraEngine_v3::o3_stopMusic(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine_v3::o3_playMusicTrack(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_playMusicTrack(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
-	playMusicTrack(stackPos(0), stackPos(1));
+int KyraEngine_v3::o3_playWanderScoreViaMap(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_playWanderScoreViaMap(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+	snd_playWanderScoreViaMap(stackPos(0), stackPos(1));
 	return 0;
 }
 
 int KyraEngine_v3::o3_playSoundEffect(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_playSoundEffect(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
-	playSoundEffect(stackPos(0), stackPos(1));
+	snd_playSoundEffect(stackPos(0), stackPos(1));
 	return 0;
 }
 
@@ -1552,7 +1552,7 @@ void KyraEngine_v3::setupOpcodeTable() {
 	Opcode(o3_setMalcolmPos);
 	Opcode(o3_stopMusic);
 	// 0x58
-	Opcode(o3_playMusicTrack);
+	Opcode(o3_playWanderScoreViaMap);
 	Opcode(o3_playSoundEffect);
 	Opcode(o3_getScore);
 	OpcodeUnImpl();