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

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

Revision: 4559
          http://sourceforge.net/p/modplug/code/4559
Author:   saga-games
Date:     2014-11-08 00:26:16 +0000 (Sat, 08 Nov 2014)
Log Message:
-----------
[Fix] Tone portamento flag was no longer reset.

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

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-11-07 21:13:10 UTC (rev 4558)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-11-08 00:26:16 UTC (rev 4559)
@@ -1351,6 +1351,7 @@
 				pChn->proTrackerOffset = 0;
 			}
 			pChn->dwFlags = (pChn->dwFlags & CHN_CHANNELFLAGS) | (pSmp->uFlags & (CHN_SAMPLEFLAGS | CHN_SURROUND));
+			pChn->dwFlags.reset(CHN_PORTAMENTO);
 			if(pChn->dwFlags[CHN_SUSTAINLOOP])
 			{
 				pChn->nLoopStart = pSmp->nSustainStart;
@@ -4711,7 +4712,7 @@
 		// instro sends to a midi chan
 		if (pIns && pIns->HasValidMIDIChannel())
 		{
-			UINT nPlug = pIns->nMixPlug;
+			PLUGINDEX nPlug = pIns->nMixPlug;
 			if ((nPlug) && (nPlug <= MAX_MIXPLUGINS))
 			{
 				IMixPlugin *pPlug = (IMixPlugin*)m_MixPlugins[nPlug-1].pMixPlugin;
@@ -4942,7 +4943,7 @@
 UINT CSoundFile::GetNoteFromPeriod(UINT period, int nFineTune, UINT nC5Speed) const
 //---------------------------------------------------------------------------------
 {
-	if (!period) return 0;
+	if(!period) return 0;
 	if(IsCompatibleMode(TRK_FASTTRACKER2))
 	{
 		// FT2's "RelocateTon" function actually rounds up and down, while GetNoteFromPeriod normally just truncates.
@@ -5132,7 +5133,7 @@
 
 
 PLUGINDEX CSoundFile::GetChannelPlugin(CHANNELINDEX nChn, PluginMutePriority respectMutes) const
-//------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------
 {
 	const ModChannel &channel = m_PlayState.Chn[nChn];
 

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