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

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

Revision: 1346
          http://modplug.svn.sourceforge.net/modplug/?rev=1346&view=rev
Author:   saga-games
Date:     2012-08-27 00:17:44 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
[Fix] IT Compatibility: Fixing Compatible Gxx even more... If there's no instrument number next to a portamento effect, also don't reset key-off status (extended test cases Off-Porta.it / Off-Porta-CompatGxx.it).

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

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2012-08-26 23:35:54 UTC (rev 1345)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2012-08-27 00:17:44 UTC (rev 1346)
@@ -1083,7 +1083,7 @@
 
 	if (!bPorta || (!(GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)))
 		|| (pChn->dwFlags[CHN_NOTEFADE] && !pChn->nFadeOutVol)
-		|| (m_SongFlags[SONG_ITCOMPATGXX] && (pChn->rowCommand.instr)))
+		|| (m_SongFlags[SONG_ITCOMPATGXX] && pChn->rowCommand.instr != 0))
 	{
 		if((GetType() & (MOD_TYPE_IT|MOD_TYPE_MPT)) && pChn->dwFlags[CHN_NOTEFADE] && !pChn->nFadeOutVol)
 		{
@@ -1109,7 +1109,7 @@
 
 	// IT compatibility: Don't reset key-off flag on porta notes unless Compat Gxx is enabled
 	// Test case: Off-Porta.it, Off-Porta-CompatGxx.it
-	if(IsCompatibleMode(TRK_IMPULSETRACKER) && bPorta && !m_SongFlags[SONG_ITCOMPATGXX])
+	if(IsCompatibleMode(TRK_IMPULSETRACKER) && bPorta && (!m_SongFlags[SONG_ITCOMPATGXX] || pChn->rowCommand.instr == 0))
 		pChn->dwFlags.reset(CHN_EXTRALOUD);
 	else
 		pChn->dwFlags.reset(CHN_EXTRALOUD | CHN_KEYOFF);

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