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

[<Rel...@us...>]

Revision: 194
          http://modplug.svn.sourceforge.net/modplug/?rev=194&view=rev
Author:   Relabsoluness
Date:     2007-11-17 12:42:39 -0800 (Sat, 17 Nov 2007)

Log Message:
-----------
1.17.02.49

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/bin/mptrack.exe
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/mptrack/bin/mptrack.exe
===================================================================
(Binary files differ)

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2007-11-17 18:31:14 UTC (rev 193)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2007-11-17 20:42:39 UTC (rev 194)
@@ -425,6 +425,22 @@
 	//Playback behavior change for MPT: Don't change sample if it is in the same instrument as previous sample.
 	if(bPorta && bNewTuning && penv == pChn->pHeader)
 		return;
+
+	bool returnAfterVolumeAdjust = false;
+	// bInstrumentChanged is used for IT carry-on env option
+	if (penv != pChn->pHeader)
+	{
+		bInstrumentChanged = TRUE;
+		pChn->pHeader = penv;
+	} else
+	// Special XM hack
+	if ((bPorta) && (m_nType & (MOD_TYPE_XM|MOD_TYPE_MT2)) && (penv)
+	 && (pChn->pInstrument) && (psmp != pChn->pInstrument))
+	{
+		// FT2 doesn't change the sample in this case,
+		// but still uses the sample info from the old one (bug?)
+		returnAfterVolumeAdjust = true;
+	}
 	
 	// Update Volume
 	if (bUpdVol)
@@ -437,23 +453,11 @@
 			if(penv && penv->nMixPlug)
 				pChn->nVolume = pChn->GetVSTVolume();
 		}
-
 	}
 
-	// bInstrumentChanged is used for IT carry-on env option
-	if (penv != pChn->pHeader)
-	{
-		bInstrumentChanged = TRUE;
-		pChn->pHeader = penv;
-	} else
-	// Special XM hack
-	if ((bPorta) && (m_nType & (MOD_TYPE_XM|MOD_TYPE_MT2)) && (penv)
-	 && (pChn->pInstrument) && (psmp != pChn->pInstrument))
-	{
-		// FT2 doesn't change the sample in this case,
-		// but still uses the sample info from the old one (bug?)
-		return;
-	}
+	if(returnAfterVolumeAdjust) return;
+
+	
 	// Instrument adjust
 	pChn->nNewIns = 0;
 	


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