[Scummvm-git-logs] scummvm master -> d34d7b650c052e5f6de925e6e6fb5b372ac8b0b8

dreammaster dreammaster at scummvm.org
Sat Sep 17 22:32:12 CEST 2016


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:
d34d7b650c XEEN: Fix setting FX pause countdowns


Commit: d34d7b650c052e5f6de925e6e6fb5b372ac8b0b8
    https://github.com/scummvm/scummvm/commit/d34d7b650c052e5f6de925e6e6fb5b372ac8b0b8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-17T16:32:04-04:00

Commit Message:
XEEN: Fix setting FX pause countdowns

Changed paths:
    engines/xeen/music.cpp



diff --git a/engines/xeen/music.cpp b/engines/xeen/music.cpp
index c445832..5d3cc62 100644
--- a/engines/xeen/music.cpp
+++ b/engines/xeen/music.cpp
@@ -177,7 +177,7 @@ bool MusicDriver::fxSetCountdown(const byte *&srcP, byte param) {
 	if (!param)
 		param = *srcP++;
 	_fxCountdownTimer = param;
-	_musDataPtr = srcP;
+	_fxDataPtr = srcP;
 	debugC(3, kDebugSound, "fxSetCountdown %d", param);
 
 	// Do paused handling and break out of processing loop
@@ -208,7 +208,7 @@ void MusicDriver::playFX(uint effectId, const byte *data) {
 		_fxPlaying = true;
 	}
 
-	debugC(1, kDebugSound, "Starting FX");
+	debugC(1, kDebugSound, "Starting FX %d", effectId);
 }
 
 void MusicDriver::playSong(const byte *data) {





More information about the Scummvm-git-logs mailing list