[OMPT-svn-commit] OpenMPT r22677 - in branches/OpenMPT-1.31: . soundlib

[<sv...@op...>]

Author: sagamusix
Date: Wed Jan  1 02:37:29 2025
New Revision: 22677
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22677

Log:
Merged revision(s) 22670 from trunk/OpenMPT:
[Imp] XM: When tracker ID is "*Converted from FOO-File*", set "made with" version info for Digitrakker accordingly.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Load_xm.cpp

Modified: branches/OpenMPT-1.31/soundlib/Load_xm.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_xm.cpp	Wed Jan  1 02:32:31 2025	(r22676)
+++ branches/OpenMPT-1.31/soundlib/Load_xm.cpp	Wed Jan  1 02:37:29 2025	(r22677)
@@ -679,9 +679,10 @@
 			m_playBehaviour.reset(kFT2ST3OffsetOutOfRange);
 			// Fix arpeggios in KAPTENFL.XM
 			m_playBehaviour.reset(kFT2Arpeggio);
-		} else if(!memcmp(fileHeader.trackerName, "*Converted ", 11))
+		} else if(!memcmp(fileHeader.trackerName, "*Converted ", 11) && !memcmp(fileHeader.trackerName + 14, "-File*", 6))
 		{
-			madeWith = verDigiTrakker;
+			madeWith = verDigiTrakker | verConfirmed;
+			madeWithTracker = UL_("Digitrakker");
 		}
 	}