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

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

Revision: 700
          http://modplug.svn.sourceforge.net/modplug/?rev=700&view=rev
Author:   saga-games
Date:     2010-09-05 23:08:56 +0000 (Sun, 05 Sep 2010)

Log Message:
-----------
[Fix] Mod Cleanup: Rearrange patterns was broken when using more than one sequence in the MPTM format. (tx Skaven)
[Mod] OpenMPT: Version is now 1.19.00.03

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

Modified: trunk/OpenMPT/mptrack/CleanupSong.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.cpp	2010-09-04 15:19:49 UTC (rev 699)
+++ trunk/OpenMPT/mptrack/CleanupSong.cpp	2010-09-05 23:08:56 UTC (rev 700)
@@ -361,7 +361,7 @@
 	CHAR s[512];
 	bool bReordered = false;
 	size_t nPatRemoved = 0;
-	PATTERNINDEX nPats, nMinToRemove = 0;
+	PATTERNINDEX nMinToRemove = 0;
 
 	BeginWaitCursor();
 	// First, find all used patterns in all sequences.
@@ -422,10 +422,10 @@
 	SEQUENCEINDEX oldSequence = pSndFile->Order.GetCurrentSequenceIndex();	// workaround, as GetSequence doesn't allow writing to sequences ATM
 
 	// Re-order pattern numbers based on sequence
+	PATTERNINDEX nPats = 0;	// last used index
 	for(SEQUENCEINDEX nSeq = 0; nSeq < maxSeqIndex; nSeq++)
 	{
 		pSndFile->Order.SetSequence(nSeq);
-		nPats = 0;
 		ORDERINDEX imap = 0;
 		for (imap = 0; imap < pSndFile->Order.GetSequence(nSeq).GetLength(); imap++)
 		{

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2010-09-04 15:19:49 UTC (rev 699)
+++ trunk/OpenMPT/mptrack/version.h	2010-09-05 23:08:56 UTC (rev 700)
@@ -15,7 +15,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					19
 #define VER_MINOR					00
-#define VER_MINORMINOR				02
+#define VER_MINORMINOR				03
 
 //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_mod.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mod.cpp	2010-09-04 15:19:49 UTC (rev 699)
+++ trunk/OpenMPT/soundlib/Load_mod.cpp	2010-09-05 23:08:56 UTC (rev 700)
@@ -477,7 +477,7 @@
 	// In the pattern loader above, a second condition is used: Only tempo commands
 	// below 100 BPM are taken into account. Furthermore, only M.K. (ProTracker)
 	// modules are checked.
-	// The same check is also applied to original NoiseTracker 15 sample mods.
+	// The same check is also applied to original Ultimate Soundtracker 15 sample mods.
 	if((bMdKd && bHasTempoCommands && GetSongTime() >= 10 * 60) || m_nSamples == 15)
 	{
 		Patterns.ForEachModCommand(FixVBlankMODs());


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