From 39cd62216fec4d56498657c11ba563c3073419b5 Mon Sep 17 00:00:00 2001
From: Johannes Schultz <sagamusix@openmpt.org>
Date: Sat, 1 Jun 2024 13:56:54 +0000
Subject: [PATCH] [Fix] S3M: Rework r20871. The file sounds broken in Impulse
 Tracker, which the sample text even warns about.

git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@20893 56274372-70c3-4bfc-bfc3-4c3a0b034d27
---
 soundlib/Load_s3m.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/soundlib/Load_s3m.cpp b/soundlib/Load_s3m.cpp
index 927009285c9..7175c45dca9 100644
--- a/soundlib/Load_s3m.cpp
+++ b/soundlib/Load_s3m.cpp
@@ -312,7 +312,6 @@ bool CSoundFile::ReadS3M(FileReader &file, ModLoadingFlags loadFlags)
 		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 @@ bool CSoundFile::ReadS3M(FileReader &file, ModLoadingFlags loadFlags)
 	{
 		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);