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

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

Revision: 361
          http://modplug.svn.sourceforge.net/modplug/?rev=361&view=rev
Author:   saga-games
Date:     2009-09-11 19:32:52 +0000 (Fri, 11 Sep 2009)

Log Message:
-----------
[Fix] MPTM Saving: Save Note Fade (~~) properly
[Fix] Mod Conversion: Unset release nodes were corrupted when converting modules

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Modedit.cpp
    trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp	2009-09-10 21:00:57 UTC (rev 360)
+++ trunk/OpenMPT/mptrack/Modedit.cpp	2009-09-11 19:32:52 UTC (rev 361)
@@ -778,7 +778,7 @@
 	TRIMENV(mptEnv->nLoopEnd);
 	TRIMENV(mptEnv->nSustainStart);
 	TRIMENV(mptEnv->nSustainEnd);
-	TRIMENV(mptEnv->nReleaseNode);
+	if(mptEnv->nReleaseNode != ENV_RELEASE_NODE_UNSET) TRIMENV(mptEnv->nReleaseNode);
 
 	#undef TRIMENV
 

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2009-09-10 21:00:57 UTC (rev 360)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2009-09-11 19:32:52 UTC (rev 361)
@@ -2190,7 +2190,7 @@
 				UINT note = m->note;
 				if (note) b |= 1;
 				if ((note) && (note < NOTE_MIN_SPECIAL)) note--;
-				if (note == NOTE_FADE) note = 0xF6;
+				if (note == NOTE_FADE && GetType() != MOD_TYPE_MPT) note = 0xF6;
 				if (m->instr) b |= 2;
 				if (m->volcmd)
 				{


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