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

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

Revision: 1373
          http://modplug.svn.sourceforge.net/modplug/?rev=1373&view=rev
Author:   saga-games
Date:     2012-10-12 18:30:20 +0000 (Fri, 12 Oct 2012)
Log Message:
-----------
[Fix] XM Compatibility: Improved XM tremor effect (ICANFLY.XM / TremorRecover.xm)
[Fix] MOD Compatibility: Partly undid Set Finetune changes (fixes Wander2.mod)
[Fix] ITP Files weren't saved correctly since OpenMPT 1.20.03.00
[Mod] OpenMPT: Version is now 1.20.03.04

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

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2012-10-10 18:57:01 UTC (rev 1372)
+++ trunk/OpenMPT/mptrack/version.h	2012-10-12 18:30:20 UTC (rev 1373)
@@ -19,7 +19,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					20
 #define VER_MINOR					03
-#define VER_MINORMINOR				03
+#define VER_MINORMINOR				04
 
 //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/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp	2012-10-10 18:57:01 UTC (rev 1372)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp	2012-10-12 18:30:20 UTC (rev 1373)
@@ -302,7 +302,7 @@
 
 	// Song global config
 
-	id = m_SongFlags[SONG_FILE_FLAGS];
+	id = (m_SongFlags & SONG_FILE_FLAGS);
 	fwrite(&id, 1, sizeof(id), f);
 	id = m_nDefaultGlobalVolume;
 	fwrite(&id, 1, sizeof(id), f);

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2012-10-10 18:57:01 UTC (rev 1372)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2012-10-12 18:30:20 UTC (rev 1373)
@@ -862,15 +862,10 @@
 		pChn->nC5Speed = pSmp->nC5Speed;
 		pChn->m_CalculateFreq = true;
 		pChn->nFineTune = 0;
-	} else
+	} else if(!bPorta || !(GetType() & (MOD_TYPE_MOD | MOD_TYPE_XM)))
 	{
-		if((!bPorta && GetType() == MOD_TYPE_XM)
-			|| (pChn->rowCommand.instr != 0 && GetType() == MOD_TYPE_MOD)
-			|| !(GetType() & (MOD_TYPE_MOD | MOD_TYPE_XM)))
-		{
-			pChn->nC5Speed = pSmp->nC5Speed;
-			pChn->nFineTune = pSmp->nFineTune;
-		}
+		pChn->nC5Speed = pSmp->nC5Speed;
+		pChn->nFineTune = pSmp->nFineTune;
 	}
 
 
@@ -1810,6 +1805,13 @@
 					{
 						// Also reload panning
 						pChn->nPan = oldSample->nPan;
+						
+						// FT2 compatibility: Instrument number disables tremor effect
+						// Test case: TremorRecover.xm
+						if(IsCompatibleMode(TRK_FASTTRACKER2))
+						{
+							pChn->nTremorCount &= ~0x80;
+						}
 					}
 				}
 			}

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