[OMPT-svn-commit] OpenMPT r21136 - trunk/OpenMPT/soundlib

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

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

Log:
[Fix] S3M: (Some) NESMusa modules were identified as Liquid Tracker.

Modified:
   trunk/OpenMPT/soundlib/Load_s3m.cpp

Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp	Thu Jul 11 22:09:27 2024	(r21135)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	Thu Jul 11 22:12:54 2024	(r21136)
@@ -341,17 +341,17 @@
 		nonCompatTracker = true;
 		break;
 	case S3MFileHeader::trkOpenMPT:
-		// Liquid Tracker's ID clashes with OpenMPT's.
-		// OpenMPT started writing full version information with OpenMPT 1.29 and later changed the ultraClicks value from 8 to 16.
-		// Liquid Tracker writes an ultraClicks value of 16.
-		// So we assume that a file was saved with Liquid Tracker if the reserved fields are 0 and ultraClicks is 16.
-		if(fileHeader.reserved2 == 0 && fileHeader.ultraClicks == 16 && fileHeader.channels[1] != 1)
+		if((fileHeader.cwtv & 0xFF00) == S3MFileHeader::trkNESMusa)
 		{
-			madeWithTracker = U_("Liquid Tracker");
+			madeWithTracker = U_("NESMusa");
 			formatTrackerStr = true;
-		} else if((fileHeader.cwtv & 0xFF00) == S3MFileHeader::trkNESMusa)
+		} else if(fileHeader.reserved2 == 0 && fileHeader.ultraClicks == 16 && fileHeader.channels[1] != 1)
 		{
-			madeWithTracker = U_("NESMusa");
+			// Liquid Tracker's ID clashes with OpenMPT's.
+			// OpenMPT started writing full version information with OpenMPT 1.29 and later changed the ultraClicks value from 8 to 16.
+			// Liquid Tracker writes an ultraClicks value of 16.
+			// So we assume that a file was saved with Liquid Tracker if the reserved fields are 0 and ultraClicks is 16.
+			madeWithTracker = U_("Liquid Tracker");
 			formatTrackerStr = true;
 		} else if(fileHeader.cwtv != S3MFileHeader::trkGraoumfTracker)
 		{