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

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

Revision: 864
          http://modplug.svn.sourceforge.net/modplug/?rev=864&view=rev
Author:   saga-games
Date:     2011-05-03 22:36:08 +0000 (Tue, 03 May 2011)

Log Message:
-----------
[Imp] MOD Saving: Instead of cutting the order list after the first +++ or --- pattern, such order items are simply removed from the saved order list.

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

Modified: trunk/OpenMPT/soundlib/Load_mod.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mod.cpp	2011-05-02 22:05:59 UTC (rev 863)
+++ trunk/OpenMPT/soundlib/Load_mod.cpp	2011-05-03 22:36:08 UTC (rev 864)
@@ -385,7 +385,7 @@
 
 	if(bFLT8)
 	{
-		// FLT8 has only equal order items, so divide by two.
+		// FLT8 has only even order items, so divide by two.
 		for(ORDERINDEX nOrd = 0; nOrd < Order.GetLength(); nOrd++)
 			Order[nOrd] >>= 1;
 	}
@@ -564,11 +564,11 @@
 
 	if ((!m_nChannels) || (!lpszFileName)) return false;
 	if ((f = fopen(lpszFileName, "wb")) == NULL) return false;
-	memset(ord, 0, sizeof(ord));
-	memset(inslen, 0, sizeof(inslen));
+	MemsetZero(ord);
+	MemsetZero(inslen);
 	if (m_nInstruments)
 	{
-		memset(insmap, 0, sizeof(insmap));
+		MemsetZero(insmap);
 		for (UINT i=1; i<32; i++) if (Instruments[i])
 		{
 			for (UINT j=0; j<128; j++) if (Instruments[i]->Keyboard[j])
@@ -614,22 +614,19 @@
 		fwrite(bTab, 30, 1, f);
 	}
 	// Writing number of patterns
-	UINT nbp = 0, norders = 128;
-	for (UINT iord=0; iord<128; iord++)
+	UINT nbp = 0, norders = 0;
+	for (UINT iord = 0; iord < 128; iord++)
 	{
-		if (Order[iord] == Order.GetInvalidPatIndex() || Order[iord] == Order.GetIgnoreIndex())
+		// Ignore +++ and --- patterns in order list, as well as high patterns (MOD officially only supports up to 128 patterns)
+		if (Order[iord] < 0x80)
 		{
-			norders = iord;
-			break;
+			if (nbp <= Order[iord]) nbp = Order[iord] + 1;
+			ord[norders++] = Order[iord];
 		}
-		if ((Order[iord] < 0x80) && (nbp <= Order[iord])) nbp = Order[iord] + 1;
 	}
 	bTab[0] = norders;
 	bTab[1] = m_nRestartPos;
 	fwrite(bTab, 2, 1, f);
-	// Writing pattern list
-	if (norders) Order.WriteToByteArray(ord, norders, 128);
-
 	fwrite(ord, 128, 1, f);
 	// Writing signature
 	if (m_nChannels == 4)


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