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

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

Revision: 2725
          http://sourceforge.net/p/modplug/code/2725
Author:   saga-games
Date:     2013-09-20 18:09:28 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
[Fix] Loading MPTM files made with older versions of OpenMPT could trash PC some note parameters.
[Mod] OpenMPT: Version is now 1.22.05.04

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

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2013-09-19 23:28:26 UTC (rev 2724)
+++ trunk/OpenMPT/common/versionNumber.h	2013-09-20 18:09:28 UTC (rev 2725)
@@ -17,7 +17,7 @@
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               22
 #define VER_MINOR               05
-#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/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2013-09-19 23:28:26 UTC (rev 2724)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2013-09-20 18:09:28 UTC (rev 2725)
@@ -2117,6 +2117,11 @@
 
 	void operator()(ModCommand& m)
 	{
+		if(m.IsPcNote())
+		{
+			return;
+		}
+
 		if(sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 17, 03, 02) ||
 			(!sndFile.IsCompatibleMode(TRK_ALLTRACKERS) && sndFile.m_dwLastSavedWithVersion < MAKE_VERSION_NUMERIC(1, 20, 00, 00)))
 		{

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