[Scummvm-cvs-logs] SF.net SVN: scummvm: [21290] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Tue Mar 14 06:26:02 CET 2006
Revision: 21290
Author: lordhoto
Date: 2006-03-14 06:25:13 -0800 (Tue, 14 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21290&view=rev
Log Message:
-----------
Fixes wrong sound then showing the death screen.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra.cpp
scummvm/trunk/engines/kyra/sound.cpp
Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp 2006-03-14 14:10:33 UTC (rev 21289)
+++ scummvm/trunk/engines/kyra/kyra.cpp 2006-03-14 14:25:13 UTC (rev 21290)
@@ -676,10 +676,7 @@
if (_deathHandler != 0xFF) {
_deathHandler = 0xFF;
snd_playWanderScoreViaMap(0, 1);
- // This causes a failed assert in playWanderScoreViaMap.
- //snd_playSoundEffect(49);
- // Playing the track directly instead.
- _sound->playTrack(29);
+ snd_playSoundEffect(49);
buttonMenuCallback(0);
}
Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp 2006-03-14 14:10:33 UTC (rev 21289)
+++ scummvm/trunk/engines/kyra/sound.cpp 2006-03-14 14:25:13 UTC (rev 21290)
@@ -406,11 +406,7 @@
void KyraEngine::snd_playSoundEffect(int track) {
debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine::snd_playSoundEffect(%d)", track);
- if (track == 49) {
- snd_playWanderScoreViaMap(56, 1);
- } else {
- _sound->playSoundEffect(track);
- }
+ _sound->playSoundEffect(track);
}
void KyraEngine::snd_playWanderScoreViaMap(int command, int restart) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list