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

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

Revision: 2349
          http://sourceforge.net/p/modplug/code/2349
Author:   saga-games
Date:     2013-06-12 21:37:41 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
[Fix] XM Loader: A default speed/tempo of 0 should be ignored in XM headers (fixes transwave by jazz & motion)
[Mod] OpenMPT: Version is now 1.22.03.04

Modified Paths:
--------------
    trunk/OpenMPT/common/versionNumber.h
    trunk/OpenMPT/soundlib/Load_xm.cpp

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2013-06-12 21:34:41 UTC (rev 2348)
+++ trunk/OpenMPT/common/versionNumber.h	2013-06-12 21:37:41 UTC (rev 2349)
@@ -17,7 +17,7 @@
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               22
 #define VER_MINOR               03
-#define VER_MINORMINOR          03
+#define VER_MINORMINOR          04
 
 //Version string. For example "1.17.02.28"
 #define MPT_VERSION_STR         VER_STRINGIZE(VER_MAJORMAJOR)"."VER_STRINGIZE(VER_MAJOR)"."VER_STRINGIZE(VER_MINOR)"."VER_STRINGIZE(VER_MINORMINOR)

Modified: trunk/OpenMPT/soundlib/Load_xm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_xm.cpp	2013-06-12 21:34:41 UTC (rev 2348)
+++ trunk/OpenMPT/soundlib/Load_xm.cpp	2013-06-12 21:37:41 UTC (rev 2349)
@@ -315,8 +315,10 @@
 	m_nRestartPos = fileHeader.restartPos;
 	m_nChannels = fileHeader.channels;
 	m_nInstruments = std::min(fileHeader.instruments, uint16(MAX_INSTRUMENTS - 1));
-	m_nDefaultSpeed = Clamp(fileHeader.speed, uint16(1), uint16(31));
-	m_nDefaultTempo = Clamp(fileHeader.tempo, uint16(32), uint16(512));
+	if(fileHeader.speed)
+		m_nDefaultSpeed = fileHeader.speed;
+	if(fileHeader.tempo)
+		m_nDefaultTempo = Clamp(fileHeader.tempo, uint16(32), uint16(512));
 
 	m_SongFlags.reset();
 	m_SongFlags.set(SONG_LINEARSLIDES, (fileHeader.flags & XMFileHeader::linearSlides) != 0);

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