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

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

Revision: 3666
          http://sourceforge.net/p/modplug/code/3666
Author:   saga-games
Date:     2014-02-05 22:55:53 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
[Fix] Just when you got it right... Volume column slides are apparently executed on the delayed tick if there's 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:15:39 UTC (rev 3665)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-02-05 22:55:53 UTC (rev 3666)
@@ -2100,11 +2100,12 @@
 			TODO is this done correctly?
 		*/
 		bool doVolumeColumn = m_nTickCount >= nStartTick;
-		// FT2 compatibility: If there's a note delay, volume column effects are NOT executed on the first tick and on delayed tick.
+		// 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
 		if(IsCompatibleMode(TRK_FASTTRACKER2) && nStartTick != 0)
 		{
-			doVolumeColumn = m_nTickCount != 0 && m_nTickCount != nStartTick;
+			doVolumeColumn = m_nTickCount != 0 && (m_nTickCount != nStartTick || pChn->rowCommand.instr == 0);
 		}
 		if(volcmd > VOLCMD_PANNING && doVolumeColumn)
 		{

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