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

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

Revision: 899
          http://modplug.svn.sourceforge.net/modplug/?rev=899&view=rev
Author:   saga-games
Date:     2011-06-14 18:24:43 +0000 (Tue, 14 Jun 2011)

Log Message:
-----------
[Fix] Saving long envelopes (> 25 envelope points) in the MPTM format was broken since... yes... revision *415*. Meaning that it never worked in any officially released version.

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

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2011-06-13 00:02:17 UTC (rev 898)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2011-06-14 18:24:43 UTC (rev 899)
@@ -590,7 +590,7 @@
 			m_nDefaultRowsPerMeasure = pifh->highlight_major;
 		}
 #ifdef DEBUG
-		if((pifh->highlight_minor & pifh->highlight_major) == 0)
+		if((pifh->highlight_minor | pifh->highlight_major) == 0)
 		{
 			Log("IT Header: Row highlight is 0");
 		}
@@ -2981,14 +2981,17 @@
 		// write full envelope information for MPTM files (more env points)
 		if(maxNodes > 25)
 		{
+			WriteInstrumentPropertyForAllInstruments('VE..', sizeof(m_defaultInstrument.VolEnv.nNodes), f, instruments, nInstruments);
 			WriteInstrumentPropertyForAllInstruments('VP[.', sizeof(m_defaultInstrument.VolEnv.Ticks ), f, instruments, nInstruments);
 			WriteInstrumentPropertyForAllInstruments('VE[.', sizeof(m_defaultInstrument.VolEnv.Values), f, instruments, nInstruments);
 
-			WriteInstrumentPropertyForAllInstruments('PP[.', sizeof(m_defaultInstrument.PanEnv.Ticks), f, instruments, nInstruments);
-			WriteInstrumentPropertyForAllInstruments('PE[.', sizeof(m_defaultInstrument.PanEnv.Values),  f, instruments, nInstruments);
+			WriteInstrumentPropertyForAllInstruments('PE..', sizeof(m_defaultInstrument.PanEnv.nNodes), f, instruments, nInstruments);
+			WriteInstrumentPropertyForAllInstruments('PP[.', sizeof(m_defaultInstrument.PanEnv.Ticks),  f, instruments, nInstruments);
+			WriteInstrumentPropertyForAllInstruments('PE[.', sizeof(m_defaultInstrument.PanEnv.Values), f, instruments, nInstruments);
 
+			WriteInstrumentPropertyForAllInstruments('PiE.', sizeof(m_defaultInstrument.PitchEnv.nNodes), f, instruments, nInstruments);
 			WriteInstrumentPropertyForAllInstruments('PiP[', sizeof(m_defaultInstrument.PitchEnv.Ticks),  f, instruments, nInstruments);
-			WriteInstrumentPropertyForAllInstruments('PiE[', sizeof(m_defaultInstrument.PitchEnv.Values),  f, instruments, nInstruments);
+			WriteInstrumentPropertyForAllInstruments('PiE[', sizeof(m_defaultInstrument.PitchEnv.Values), f, instruments, nInstruments);
 		}
 	}
 


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