[Scummvm-git-logs] scummvm master -> f2766d743bab00a8389b82f5fb0e2873bbf92677
dreammaster
dreammaster at scummvm.org
Thu Nov 23 20:29:36 CET 2017
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:
f2766d743b XEEN: Fix crash playing Fx when music is playing
Commit: f2766d743bab00a8389b82f5fb0e2873bbf92677
https://github.com/scummvm/scummvm/commit/f2766d743bab00a8389b82f5fb0e2873bbf92677
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-23T14:29:28-05:00
Commit Message:
XEEN: Fix crash playing Fx when music is playing
Changed paths:
engines/xeen/music.cpp
diff --git a/engines/xeen/music.cpp b/engines/xeen/music.cpp
index ab22afd..aea4850 100644
--- a/engines/xeen/music.cpp
+++ b/engines/xeen/music.cpp
@@ -200,7 +200,6 @@ bool MusicDriver::fxEndSubroutine(const byte *&srcP, byte param) {
void MusicDriver::playFX(uint effectId, const byte *data) {
if (!_fxPlaying || effectId < 7 || effectId >= 11) {
- _musStartPtr = nullptr;
_fxDataPtr = _fxStartPtr = data;
_fxCountdownTimer = 0;
_channels[7]._changeFrequency = _channels[8]._changeFrequency = false;
More information about the Scummvm-git-logs
mailing list