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

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

Revision: 1417
          http://modplug.svn.sourceforge.net/modplug/?rev=1417&view=rev
Author:   saga-games
Date:     2012-11-04 18:10:29 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
[Fix] XM Loader: Importing patterns >= 240 didn't work (http://bugs.openmpt.org/view.php?id=308)
[Mod] OpenMPT: Version is now 1.20.04.02

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/version.h
    trunk/OpenMPT/soundlib/Load_xm.cpp
    trunk/OpenMPT/soundlib/Sndfile.cpp

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2012-11-04 18:07:54 UTC (rev 1416)
+++ trunk/OpenMPT/mptrack/version.h	2012-11-04 18:10:29 UTC (rev 1417)
@@ -19,7 +19,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					20
 #define VER_MINOR					04
-#define VER_MINORMINOR				01
+#define VER_MINORMINOR				02
 
 //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_xm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_xm.cpp	2012-11-04 18:07:54 UTC (rev 1416)
+++ trunk/OpenMPT/soundlib/Load_xm.cpp	2012-11-04 18:10:29 UTC (rev 1417)
@@ -121,6 +121,7 @@
 //----------------------------------------------------------------------------------------
 {
 	// Reading patterns
+	sndFile.Patterns.ResizeArray(fileHeader.patterns);
 	for(PATTERNINDEX pat = 0; pat < fileHeader.patterns; pat++)
 	{
 		size_t curPos = file.GetPosition();
@@ -277,7 +278,7 @@
 
 	StringFixer::ReadString<StringFixer::spacePadded>(m_szNames[0], fileHeader.songName);
 
-	m_nType = MOD_TYPE_XM;
+	ChangeModTypeTo(MOD_TYPE_XM);
 	m_nMinPeriod = 27;
 	m_nMaxPeriod = 54784;
 

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2012-11-04 18:07:54 UTC (rev 1416)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2012-11-04 18:10:29 UTC (rev 1417)
@@ -1749,11 +1749,13 @@
 void CSoundFile::ChangeModTypeTo(const MODTYPE& newType)
 //------------------------------------------------------
 {
-	const MODTYPE oldtype = m_nType;
-	if (oldtype == newType)
-		return;
+	const MODTYPE oldtype = GetType();
 	m_nType = newType;
 	SetModSpecsPointer(m_pModSpecs, m_nType);
+
+	if(oldtype == newType)
+		return;
+
 	SetupMODPanning(); // Setup LRRL panning scheme if needed
 	SetupITBidiMode(); // Setup IT bidi mode
 

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