[OMPT-svn-commit] SF.net SVN: modplug:[3664] trunk/OpenMPT

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

Revision: 3664
          http://sourceforge.net/p/modplug/code/3664
Author:   saga-games
Date:     2014-02-05 21:18:59 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
[Fix] FT2 compatiblity: If there's a note delay, volume column effects are NOT executed on the first tick and on delayed tick. Test case: VolColDelay.xm
[Mod] OpenMPT: Version is now 1.22.07.19

Modified Paths:
--------------
    trunk/OpenMPT/common/versionNumber.h
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2014-02-05 17:40:12 UTC (rev 3663)
+++ trunk/OpenMPT/common/versionNumber.h	2014-02-05 21:18:59 UTC (rev 3664)
@@ -17,7 +17,7 @@
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               22
 #define VER_MINOR               07
-#define VER_MINORMINOR          18
+#define VER_MINORMINOR          19
 
 //Version string. For example "1.17.02.28"
 #define MPT_VERSION_STR         VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-02-05 17:40:12 UTC (rev 3663)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-02-05 21:18:59 UTC (rev 3664)
@@ -2092,8 +2092,15 @@
 			so... hxx = (hx | (oldhxx & 0xf0))  ???
 			TODO is this done correctly?
 		*/
-		if((volcmd > VOLCMD_PANNING) && (m_nTickCount >= nStartTick))
+		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.
+		// Test case: VolColDelay.xm
+		if(IsCompatibleMode(TRK_FASTTRACKER2) && nStartTick != 0)
 		{
+			doVolumeColumn = m_nTickCount != 0 && m_nTickCount != nStartTick;
+		}
+		if(volcmd > VOLCMD_PANNING && doVolumeColumn)
+		{
 			if (volcmd == VOLCMD_TONEPORTAMENTO)
 			{
 				UINT param = 0;

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