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

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

Author: sagamusix
Date: Sat Jun  1 15:56:54 2024
New Revision: 20893
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20893

Log:
[Fix] S3M: Rework r20871. The file sounds broken in Impulse Tracker, which the sample text even warns about.

Modified:
   trunk/OpenMPT/soundlib/Load_s3m.cpp

Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp	Sat Jun  1 09:21:46 2024	(r20892)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	Sat Jun  1 15:56:54 2024	(r20893)
@@ -312,7 +312,6 @@
 		m_playBehaviour.set(kITRetrigger);
 		m_playBehaviour.set(kITShortSampleRetrig);
 		m_playBehaviour.set(kST3SampleSwap);  // Not exactly like ST3, but close enough
-		// alien.s3m by Davers (pattern 13) needs these to play the Gxx with sample switch as intended
 		m_playBehaviour.set(kITPortaNoNote);
 		m_playBehaviour.set(kITPortamentoSwapResetsPos);
 		m_nMinPeriod = 1;
@@ -374,7 +373,7 @@
 	{
 		m_playBehaviour.reset(kST3NoMutedChannels);
 		m_playBehaviour.reset(kST3EffectMemory);
-		m_playBehaviour.set(kST3PortaSampleChange, (fileHeader.cwtv& S3MFileHeader::trackerMask) == S3MFileHeader::trkImpulseTracker);
+		m_playBehaviour.reset(kST3PortaSampleChange);
 		m_playBehaviour.reset(kST3VibratoMemory);
 		m_playBehaviour.reset(KST3PortaAfterArpeggio);
 		m_playBehaviour.reset(kST3OffsetWithoutInstrument);