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

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

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

Log:
Merged revision(s) 21138 from trunk/OpenMPT:
[Imp] S3M: Detect files saved with Sound Club 2.
........

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

Modified: branches/OpenMPT-1.31/soundlib/Load_s3m.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_s3m.cpp	Thu Jul 11 23:12:27 2024	(r21138)
+++ branches/OpenMPT-1.31/soundlib/Load_s3m.cpp	Thu Jul 11 23:12:43 2024	(r21139)
@@ -248,7 +248,10 @@
 			madeWithTracker = U_("Akord");
 		break;
 	case S3MFileHeader::trkScreamTracker:
-		if(fileHeader.cwtv == S3MFileHeader::trkST3_20 && fileHeader.special == 0 && (fileHeader.ordNum & 0x0F) == 0 && fileHeader.ultraClicks == 0 && (fileHeader.flags & ~0x50) == 0 && fileHeader.usePanningTable == S3MFileHeader::idPanning)
+		if(!memcmp(&fileHeader.reserved2, "SCLUB2.0", 8))
+		{
+			madeWithTracker = U_("Sound Club 2");
+		} else if(fileHeader.cwtv == S3MFileHeader::trkST3_20 && fileHeader.special == 0 && (fileHeader.ordNum & 0x0F) == 0 && fileHeader.ultraClicks == 0 && (fileHeader.flags & ~0x50) == 0 && fileHeader.usePanningTable == S3MFileHeader::idPanning)
 		{
 			// MPT and OpenMPT before 1.17.03.02 - Simply keep default (filter) MIDI macros
 			if((fileHeader.masterVolume & 0x80) != 0)