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

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

Revision: 657
          http://modplug.svn.sourceforge.net/modplug/?rev=657&view=rev
Author:   saga-games
Date:     2010-07-18 23:05:20 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
[Fix] Saving XM files with 127 channels (sigh) was broken.
[Mod] OpenMPT: Version is now 1.18.02.05

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

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2010-07-18 22:40:22 UTC (rev 656)
+++ trunk/OpenMPT/mptrack/version.h	2010-07-18 23:05:20 UTC (rev 657)
@@ -15,7 +15,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					18
 #define VER_MINOR					02
-#define VER_MINORMINOR				04
+#define VER_MINORMINOR				05
 
 //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	2010-07-18 22:40:22 UTC (rev 656)
+++ trunk/OpenMPT/soundlib/Load_xm.cpp	2010-07-18 23:05:20 UTC (rev 657)
@@ -766,7 +766,7 @@
 	xmheader.restartpos = LittleEndianW(m_nRestartPos);
 
 	xmheader.channels = (m_nChannels + 1) & 0xFFFE; // avoid odd channel count for FT2 compatibility
-	if(m_nChannels & 1) bAddChannel = true;
+	if((m_nChannels & 1) && m_nChannels < MAX_BASECHANNELS) bAddChannel = true;
 	if(bCompatibilityExport && xmheader.channels > 32)
 		xmheader.channels = 32;
 	if(xmheader.channels > MAX_BASECHANNELS) xmheader.channels = MAX_BASECHANNELS;


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