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

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

Revision: 1926
          http://sourceforge.net/p/modplug/code/1926
Author:   saga-games
Date:     2013-04-21 18:35:35 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
[Fix] FT2 Compatiblity: Now the Rxy tick-0 behaviour really should be "balls-on" (test case: RetrigTick0.xm)

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

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-04-21 17:55:51 UTC (rev 1925)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-04-21 18:35:35 UTC (rev 1926)
@@ -4123,12 +4123,13 @@
 	} else if(IsCompatibleMode(TRK_FASTTRACKER2) && (param & 0x100))
 	{
 		// Buggy-like-hell FT2 Rxy retrig!
+		// Test case: retrig.xm
 		if(m_SongFlags[SONG_FIRSTTICK])
 		{
 			// Here are some really stupid things FT2 does.
+			// Test case: RetrigTick0.xm
 			if(chn.rowCommand.volcmd == VOLCMD_VOLUME) return;
-			if(chn.rowCommand.instr > 0 && chn.rowCommand.note == NOTE_NONE) nRetrigCount = 1;
-			if(chn.rowCommand.IsNote()) nRetrigCount = 1;
+			if(chn.rowCommand.instr > 0 && chn.rowCommand.IsNoteOrEmpty()) nRetrigCount = 1;
 		}
 		if (nRetrigCount >= nRetrigSpeed)
 		{

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