[OMPT-svn-commit] SF.net SVN: modplug:[4232] trunk/OpenMPT/soundlib/Snd_fx.cpp

[<sag...@us...>]

Revision: 4232
          http://sourceforge.net/p/modplug/code/4232
Author:   saga-games
Date:     2014-09-01 22:51:21 +0000 (Mon, 01 Sep 2014)
Log Message:
-----------
[Fix] ProTracker compatiblity: Further refine 9xx behaviour so that the outro in faggot's universe by dee-lite is played correctly

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-09-01 17:05:41 UTC (rev 4231)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-09-01 22:51:21 UTC (rev 4232)
@@ -596,6 +596,7 @@
 				bool porta = p->command == CMD_TONEPORTAMENTO /*|| p->command CMD_TONEPORTAVOL || p->volcmd == VOLCMD_TONEPORTAMENTO*/; // Volume column tone portamento can be crazy, and CMD_TONEPORTAVOL requires volume slides which we don't emulate right now.
 				bool stopNote = patternLoopStartedOnThisRow;	// It's too much trouble to keep those pattern loops in sync...
 
+				if(p->instr) pChn->proTrackerOffset = 0;
 				if(p->IsNote())
 				{
 					pChn->nNewNote = pChn->nLastNote;
@@ -949,10 +950,9 @@
 		if(pSmp)
 		{
 			pChn->nVolume = pSmp->nVolume;
-		} else
+		} else if(pIns && pIns->nMixPlug)
 		{
-			if(pIns && pIns->nMixPlug)
-				pChn->nVolume = pChn->GetVSTVolume();
+			pChn->nVolume = pChn->GetVSTVolume();
 		}
 	}
 
@@ -1340,7 +1340,7 @@
 			{
 				pChn->proTrackerOffset = 0;
 			}
-			pChn->dwFlags = (pChn->dwFlags & CHN_CHANNELFLAGS) | (static_cast<ChannelFlags>(pSmp->uFlags) & CHN_SAMPLEFLAGS);
+			pChn->dwFlags = (pChn->dwFlags & CHN_CHANNELFLAGS) | (pSmp->uFlags & CHN_SAMPLEFLAGS);
 			if(pChn->dwFlags[CHN_SUSTAINLOOP])
 			{
 				pChn->nLoopStart = pSmp->nSustainStart;
@@ -2018,11 +2018,17 @@
 			bPorta = false;
 		}
 
-		// ProTracker compatibility: Instrument change always happens on the first tick, even when there is a note delay.
-		// Test case: InstrDelay.mod
-		if(instr && !m_PlayState.m_nTickCount && !triggerNote && m_SongFlags[SONG_PT1XMODE])
+		if(m_SongFlags[SONG_PT1XMODE] && instr && !m_PlayState.m_nTickCount)
 		{
-			InstrumentChange(pChn, instr, true, true, false);
+			// Instrument number resets the stacked ProTracker offset.
+			// Test case: ptoffset.mod
+			pChn->proTrackerOffset = 0;
+			// ProTracker compatibility: Instrument change always happens on the first tick, even when there is a note delay.
+			// Test case: InstrDelay.mod
+			if(!triggerNote)
+			{
+				InstrumentChange(pChn, instr, true, true, false);
+			}
 		}
 
 		// Handles note/instrument/volume changes
@@ -4417,7 +4423,6 @@
 	}
 // -! NEW_FEATURE#0010
 
-	if(pChn->rowCommand.instr) pChn->proTrackerOffset = 0;
 	pChn->proTrackerOffset += param;
 
 	if(pChn->rowCommand.IsNote())

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.