[OMPT-svn-commit] SF.net SVN: modplug:[1995] trunk/OpenMPT/soundlib/Snd_fx.cpp

[<sag...@us...>]

Revision: 1995
          http://sourceforge.net/p/modplug/code/1995
Author:   saga-games
Date:     2013-04-28 16:11:23 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
[Fix] Noteoff with no volume envelope only should fade the sample if there is a volume command in the volume column (previously this applied to all kinds of commands in this column). Test case: NoteOffVolume.xm, http://bugs.openmpt.org/view.php?id=387

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-04-28 15:53:16 UTC (rev 1994)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-04-28 16:11:23 UTC (rev 1995)
@@ -1804,8 +1804,9 @@
 			{
 
 				// XM: Key-Off + Sample == Note Cut (BUT: Only if no instr number or volume effect is present!)
+				// Test case: NoteOffVolume.xm
 				if(note == NOTE_KEYOFF
-					&& ((!instr && volcmd == VOLCMD_NONE && cmd != CMD_VOLUME) || !IsCompatibleMode(TRK_FASTTRACKER2))
+					&& ((!instr && volcmd != VOLCMD_VOLUME && cmd != CMD_VOLUME) || !IsCompatibleMode(TRK_FASTTRACKER2))
 					&& (pChn->pModInstrument == nullptr || !pChn->pModInstrument->VolEnv.dwFlags[ENV_ENABLED]))
 				{
 					pChn->dwFlags.set(CHN_FASTVOLRAMP);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.