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

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

Revision: 1281
          http://modplug.svn.sourceforge.net/modplug/?rev=1281&view=rev
Author:   saga-games
Date:     2012-05-25 17:04:28 +0000 (Fri, 25 May 2012)
Log Message:
-----------
[Fix] Removed portamento speed A01 "fix"

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

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2012-05-24 17:30:56 UTC (rev 1280)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2012-05-25 17:04:28 UTC (rev 1281)
@@ -2521,7 +2521,7 @@
 		return;
 	}
 	// Regular Slide
-	if (!(m_dwSongFlags & SONG_FIRSTTICK) || (m_nMusicSpeed == 1))  //rewbs.PortaA01fix
+	if (!(m_dwSongFlags & SONG_FIRSTTICK))
 	{
 		DoFreqSlide(pChn, -int(param) * 4);
 	}
@@ -2563,7 +2563,7 @@
 		}
 		return;
 	}
-	if (!(m_dwSongFlags & SONG_FIRSTTICK)  || (m_nMusicSpeed == 1))	//rewbs.PortaA01fix
+	if (!(m_dwSongFlags & SONG_FIRSTTICK))
 	{
 		DoFreqSlide(pChn, int(param) * 4);
 	}
@@ -2799,12 +2799,12 @@
 	} //End candidate MPT behavior.
 
 	if (param) pChn->nPortamentoSlide = param * 4;
-	if ((pChn->nPeriod) && (pChn->nPortamentoDest) && ((m_nMusicSpeed == 1) || !(m_dwSongFlags & SONG_FIRSTTICK)))  //rewbs.PortaA01fix
+	if (pChn->nPeriod && pChn->nPortamentoDest && !(m_dwSongFlags & SONG_FIRSTTICK))
 	{
 		if (pChn->nPeriod < pChn->nPortamentoDest)
 		{
 			LONG delta = (int)pChn->nPortamentoSlide;
-			if ((m_dwSongFlags & SONG_LINEARSLIDES) && (!(m_nType & (MOD_TYPE_XM|MOD_TYPE_MT2))))
+			if ((m_dwSongFlags & SONG_LINEARSLIDES) && (!(GetType() & (MOD_TYPE_XM|MOD_TYPE_MT2))))
 			{
 				UINT n = pChn->nPortamentoSlide >> 2;
 				if (n > 255) n = 255;
@@ -2819,7 +2819,7 @@
 		if (pChn->nPeriod > pChn->nPortamentoDest)
 		{
 			LONG delta = - (int)pChn->nPortamentoSlide;
-			if ((m_dwSongFlags & SONG_LINEARSLIDES) && (!(m_nType & (MOD_TYPE_XM|MOD_TYPE_MT2))))
+			if ((m_dwSongFlags & SONG_LINEARSLIDES) && (!(GetType() & (MOD_TYPE_XM|MOD_TYPE_MT2))))
 			{
 				UINT n = pChn->nPortamentoSlide >> 2;
 				if (n > 255) n = 255;

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