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

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

Author: sagamusix
Date: Thu Jul 11 22:09:27 2024
New Revision: 21135
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21135

Log:
Merged revision(s) 21134 from trunk/OpenMPT:
[Imp] S3M: Identify early IT versions.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Load_s3m.cpp
   branches/OpenMPT-1.31/soundlib/S3MTools.h

Modified: branches/OpenMPT-1.31/soundlib/Load_s3m.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_s3m.cpp	Thu Jul 11 22:09:10 2024	(r21134)
+++ branches/OpenMPT-1.31/soundlib/Load_s3m.cpp	Thu Jul 11 22:09:27 2024	(r21135)
@@ -270,6 +270,9 @@
 				madeWithTracker = U_("PlayerPRO");
 			else  // Always stereo
 				madeWithTracker = U_("Velvet Studio");
+		} else if(fileHeader.cwtv == S3MFileHeader::trkST3_20 && fileHeader.special == 0 && fileHeader.ultraClicks == 0 && fileHeader.flags == 8 && fileHeader.usePanningTable == 0)
+		{
+			madeWithTracker = U_("Impulse Tracker < 1.03");  // Not sure if 1.02 saves like this as I don't have it
 		} else
 		{
 			// ST3.20 should only ever write ultra-click values 16, 24 and 32 (corresponding to 8, 12 and 16 in the GUI), ST3.01/3.03 should only write 0,
@@ -294,6 +297,9 @@
 		{
 			madeWithTracker = U_("Impulse Tracker");
 			formatTrackerStr = true;
+		} else if (fileHeader.cwtv == S3MFileHeader::trkIT1_old)
+		{
+			madeWithTracker = U_("Impulse Tracker 1.03");  // Could also be 1.02, maybe? I don't have that one
 		} else
 		{
 			madeWithTracker = MPT_UFORMAT("Impulse Tracker 2.14p{}")(fileHeader.cwtv - S3MFileHeader::trkIT2_14);

Modified: branches/OpenMPT-1.31/soundlib/S3MTools.h
==============================================================================
--- branches/OpenMPT-1.31/soundlib/S3MTools.h	Thu Jul 11 22:09:10 2024	(r21134)
+++ branches/OpenMPT-1.31/soundlib/S3MTools.h	Thu Jul 11 22:09:27 2024	(r21135)
@@ -48,6 +48,7 @@
 		trkST3_00         = 0x1300,
 		trkST3_20         = 0x1320,
 		trkST3_01         = 0x1301,
+		trkIT1_old        = 0x3320,
 		trkIT2_07         = 0x3207,
 		trkIT2_14         = 0x3214,
 		trkBeRoTrackerOld = 0x4100,  // Used from 2004 to 2012