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

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

Revision: 1484
          http://sourceforge.net/p/modplug/code/1484
Author:   saga-games
Date:     2013-01-12 16:32:37 +0000 (Sat, 12 Jan 2013)
Log Message:
-----------
[Fix] IT Compatibility: Revised patch from revision 1481 to be actually correct.
[Mod] OpenMPT: Version is now 1.21.01.05

Revision Links:
--------------
    http://sourceforge.net/p/modplug/code/1481

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/version.h
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2013-01-07 14:56:30 UTC (rev 1483)
+++ trunk/OpenMPT/mptrack/version.h	2013-01-12 16:32:37 UTC (rev 1484)
@@ -19,7 +19,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					21
 #define VER_MINOR					01
-#define VER_MINORMINOR				04
+#define VER_MINORMINOR				05
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-01-07 14:56:30 UTC (rev 1483)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-01-12 16:32:37 UTC (rev 1484)
@@ -791,10 +791,11 @@
 		// Test case: EnvReset.it
 		if(IsCompatibleMode(TRK_IMPULSETRACKER))
 		{
+			const bool insNumber = (instr != 0);
 			reset = (!pChn->nLength
-				|| (instrumentChanged && bPorta && m_SongFlags[SONG_ITCOMPATGXX])
-				|| (instrumentChanged && !bPorta && pChn->dwFlags[CHN_NOTEFADE | CHN_KEYOFF] && m_SongFlags[SONG_ITOLDEFFECTS]));
-			resetAlways = (instrumentChanged || pChn->dwFlags[CHN_KEYOFF]);
+				|| (insNumber && bPorta && m_SongFlags[SONG_ITCOMPATGXX])
+				|| (insNumber && !bPorta && pChn->dwFlags[CHN_NOTEFADE | CHN_KEYOFF] && m_SongFlags[SONG_ITOLDEFFECTS]));
+			resetAlways = (insNumber || pChn->dwFlags[CHN_KEYOFF]);
 		} else
 		{
 			reset = (!bPorta || !(GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)) || m_SongFlags[SONG_ITCOMPATGXX]

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