diff options
| author | James Cowgill <jcowgill@debian.org> | 2019-09-30 21:22:16 +0100 |
|---|---|---|
| committer | James Cowgill <jcowgill@debian.org> | 2019-09-30 21:22:16 +0100 |
| commit | e624a7c2c332f7bbdbc6a087bd8c259f59d225b0 (patch) | |
| tree | 450e3499c3502a31b6dbd8adc9097f804320d8e6 /soundlib/Snd_fx.cpp | |
| parent | 057f26b51acc1ec75a03ec539569860efd9e9d33 (diff) | |
New upstream version 0.4.8
Diffstat (limited to 'soundlib/Snd_fx.cpp')
| -rw-r--r-- | soundlib/Snd_fx.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/soundlib/Snd_fx.cpp b/soundlib/Snd_fx.cpp index 112ec82..3252d3c 100644 --- a/soundlib/Snd_fx.cpp +++ b/soundlib/Snd_fx.cpp @@ -2028,7 +2028,7 @@ void CSoundFile::NoteChange(ModChannel &chn, int note, bool bPorta, bool bResetE if((chn.nCutOff < 0x7F || m_playBehaviour[kITFilterBehaviour]) && useFilter) { int cutoff = SetupChannelFilter(chn, true); - if(cutoff >= 0 && chn.dwFlags[CHN_ADLIB] && m_opl) + if(cutoff >= 0 && chn.dwFlags[CHN_ADLIB] && m_opl && channelHint != CHANNELINDEX_INVALID) m_opl->Volume(channelHint, chn.nCutOff / 2u, true); } } @@ -5457,7 +5457,7 @@ void CSoundFile::RetrigNote(CHANNELINDEX nChn, int param, int offset) bool fading = chn.dwFlags[CHN_NOTEFADE]; // IT compatibility: Really weird combination of envelopes and retrigger (see Storlek's q.it testcase) // Test case: retrig.it - NoteChange(chn, note, m_playBehaviour[kITRetrigger], resetEnv); + NoteChange(chn, note, m_playBehaviour[kITRetrigger], resetEnv, false, nChn); // XM compatibility: Prevent NoteChange from resetting the fade flag in case an instrument number + note-off is present. // Test case: RetrigFade.xm if(fading && GetType() == MOD_TYPE_XM) |