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

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

Revision: 731
          http://modplug.svn.sourceforge.net/modplug/?rev=731&view=rev
Author:   saga-games
Date:     2010-10-03 16:15:11 +0000 (Sun, 03 Oct 2010)

Log Message:
-----------
[Fix] IT Compatibility: Fixed a combination of multisample instruments and Gxx (fixes the guitars in "Ultima Ratio" by Nebularia and some subtle things in spx-shuttledeparture.it)

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

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2010-10-03 16:13:09 UTC (rev 730)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2010-10-03 16:15:11 UTC (rev 731)
@@ -475,9 +475,38 @@
 
 	if ((pIns) && (note) && (note <= 128))
 	{
-		if (pIns->NoteMap[note-1] >= NOTE_MIN_SPECIAL) return;
-		UINT n = pIns->Keyboard[note-1];
-		pSmp = ((n) && (n < MAX_SAMPLES)) ? &Samples[n] : NULL;
+		if(bPorta && pIns == pChn->pModInstrument && pChn->pModSample->pSample != nullptr && IsCompatibleMode(TRK_IMPULSETRACKER))
+		{
+#ifdef DEBUG
+			{
+				// Check if original behaviour would have been used here
+				if (pIns->NoteMap[note-1] >= NOTE_MIN_SPECIAL)
+				{
+					ASSERT(false);
+					return;
+				}
+				UINT n = pIns->Keyboard[note-1];
+				pSmp = ((n) && (n < MAX_SAMPLES)) ? &Samples[n] : nullptr;
+				if(pSmp != pChn->pModSample)
+				{
+					ASSERT(false);
+				}
+			}
+#endif // DEBUG
+			// Impulse Tracker doesn't seem to look up the sample for new notes when in instrument mode and it encounters a situation like this:
+			// G-6 01 ... ... <-- G-6 is bound to sample 01
+			// F-6 01 ... GFF <-- F-6 is bound to sample 02, but sample 01 will be played
+			// This behaviour is not used if sample 01 has no actual sample data (hence the "pChn->pModSample->pSample != nullptr")
+			// and it is also ignored when the instrument number changes. This fixes f.e. the guitars in "Ultima Ratio" by Nebularia
+			// and some slides in spx-shuttledeparture.it.
+			pSmp = pChn->pModSample;
+		} else
+		{
+			// Original behaviour
+			if (pIns->NoteMap[note-1] >= NOTE_MIN_SPECIAL) return;
+			UINT n = pIns->Keyboard[note-1];
+			pSmp = ((n) && (n < MAX_SAMPLES)) ? &Samples[n] : nullptr;
+		}
 	} else
 	if (m_nInstruments)
 	{
@@ -656,7 +685,6 @@
 	}
 
 	
-	
 	pChn->pSample = pSmp->pSample;
 	pChn->nTranspose = pSmp->RelativeTone;
 
@@ -738,7 +766,7 @@
 			pChn->nFineTune = pSmp->nFineTune;
 		}
 	}
-	// IT Compatibility: Update multisample instruments frequency even if instrument is not specified
+	// IT Compatibility: Update multisample instruments frequency even if instrument is not specified (fixes the guitars in spx-shuttledeparture.it)
 	if(!bPorta && pSmp && IsCompatibleMode(TRK_IMPULSETRACKER)) pChn->nC5Speed = pSmp->nC5Speed;
 
 	// XM Compatibility: Ignore notes with portamento if there was no note playing.


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