[Scummvm-cvs-logs] scummvm master -> eb731514f7b27ca61b697ece0295dd79c29c141a

lordhoto lordhoto at gmail.com
Thu Apr 7 01:12:10 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
eb731514f7 KYRA: Slight cleanup.


Commit: eb731514f7b27ca61b697ece0295dd79c29c141a
    https://github.com/scummvm/scummvm/commit/eb731514f7b27ca61b697ece0295dd79c29c141a
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-04-06T16:09:52-07:00

Commit Message:
KYRA: Slight cleanup.

This more or less silently fixes the silent music introduced with f19e201, by
me setting volume to "true" instead of "255". Whoops.

Changed paths:
    engines/kyra/kyra_mr.cpp



diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 2c94818..fee7835 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -426,9 +426,7 @@ void KyraEngine_MR::snd_playWanderScoreViaMap(int track, int force) {
 	if (_musicSoundChannel == -1) {
 		assert(track < _soundListSize && track >= 0);
 
-		char file[13];
-		sprintf(file, "%s", _soundList[track]);
-		_musicSoundChannel = _soundDigital->playSound(file, 0xFF, Audio::Mixer::kMusicSoundType, true);
+		_musicSoundChannel = _soundDigital->playSound(_soundList[track], 0xFF, Audio::Mixer::kMusicSoundType, 255, true);
 	}
 
 	_lastMusicCommand = track;






More information about the Scummvm-git-logs mailing list