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

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

Revision: 3667
          http://sourceforge.net/p/modplug/code/3667
Author:   saga-games
Date:     2014-02-06 14:33:21 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
[Fix] FT2 compatibility: Fix portamento + note delay + no instrument number

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

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-02-05 22:55:53 UTC (rev 3666)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-02-06 14:33:21 UTC (rev 3667)
@@ -2102,10 +2102,10 @@
 		bool doVolumeColumn = m_nTickCount >= nStartTick;
 		// FT2 compatibility: If there's a note delay, volume column effects are NOT executed
 		// on the first tick and, if there's an instrument number, on the delayed tick.
-		// Test case: VolColDelay.xm
+		// Test case: VolColDelay.xm, PortaDelay.xm
 		if(IsCompatibleMode(TRK_FASTTRACKER2) && nStartTick != 0)
 		{
-			doVolumeColumn = m_nTickCount != 0 && (m_nTickCount != nStartTick || pChn->rowCommand.instr == 0);
+			doVolumeColumn = m_nTickCount != 0 && (m_nTickCount != nStartTick || (pChn->rowCommand.instr == 0 && volcmd != VOLCMD_TONEPORTAMENTO));
 		}
 		if(volcmd > VOLCMD_PANNING && doVolumeColumn)
 		{

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