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

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

Revision: 1996
          http://sourceforge.net/p/modplug/code/1996
Author:   saga-games
Date:     2013-04-28 16:56:58 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
[Fix] FT2 compatibility: Instrument number resets tremor count.

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

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-04-28 16:11:23 UTC (rev 1995)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-04-28 16:56:58 UTC (rev 1996)
@@ -1163,16 +1163,11 @@
 		// IT compatibility 15. Retrigger is reset in RetrigNote (Tremor doesn't store anything here, so we just don't reset this as well)
 		if(!IsCompatibleMode(TRK_IMPULSETRACKER))
 		{
-			// FT2 compatibility: Retrigger is reset in RetrigNote
+			// FT2 compatibility: Retrigger is reset in RetrigNote, tremor in ProcessEffects
 			if(!IsCompatibleMode(TRK_FASTTRACKER2))
 			{
 				pChn->nRetrigCount = 0;
 				pChn->nTremorCount = 0;
-			} else
-			{
-				// FT2 Compatibility: Weird XM tremor.
-				// Test case: Tremor.xm
-				pChn->nTremorCount = 0x20;
 			}
 		}
 
@@ -1845,7 +1840,6 @@
 						reloadSampleSettings = true;
 					}
 				}
-
 			}
 
 			if((retrigEnv && !IsCompatibleMode(TRK_FASTTRACKER2)) || reloadSampleSettings)
@@ -1869,19 +1863,19 @@
 					{
 						// Also reload panning
 						pChn->nPan = oldSample->nPan;
-						
-						// FT2 compatibility: Instrument number disables tremor effect
-						// Test case: TremorRecover.xm
-						if(IsCompatibleMode(TRK_FASTTRACKER2))
-						{
-							pChn->nTremorCount &= ~0x80;
-						}
 					}
 				}
 			}
 
-			if (retrigEnv) //Case: instrument with no note data.
+			// FT2 compatibility: Instrument number disables tremor effect
+			// Test case: TremorInstr.xm, TremoRecover.xm
+			if(IsCompatibleMode(TRK_FASTTRACKER2) && instr != 0)
 			{
+				pChn->nTremorCount = 0x20;
+			}
+
+			if(retrigEnv) //Case: instrument with no note data.
+			{
 				//IT compatibility: Instrument with no note.
 				if(IsCompatibleMode(TRK_IMPULSETRACKER) || m_SongFlags[SONG_PT1XMODE])
 				{

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