[OMPT-svn-commit] SF.net SVN: modplug:[449] trunk/OpenMPT

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

Revision: 449
          http://modplug.svn.sourceforge.net/modplug/?rev=449&view=rev
Author:   saga-games
Date:     2009-12-23 19:56:16 +0000 (Wed, 23 Dec 2009)

Log Message:
-----------
[Fix] XM Compatibility: Perfect emulation of buggy Rxy behaviour. Thanks to Ian Luck for helping me with this.
[Imp] Pattern Editor: When using Find&Replace, "follow song" will be disabled, because it's pointless and unusable with "follow song" on.

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

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2009-12-23 13:43:29 UTC (rev 448)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2009-12-23 19:56:16 UTC (rev 449)
@@ -1817,6 +1817,10 @@
 				nFound++;
 				if (bUpdPos)
 				{
+					// turn off "follow song"
+					m_dwStatus &= ~PATSTATUS_FOLLOWSONG;
+					SendCtrlMessage(CTRLMSG_PAT_FOLLOWSONG, 0);
+					// go to place of finding
 					SetCurrentPattern(nPat);
 					SetCurrentRow(n / pSndFile->m_nChannels);
 				}

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2009-12-23 13:43:29 UTC (rev 448)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2009-12-23 19:56:16 UTC (rev 449)
@@ -3165,8 +3165,8 @@
 		if(m_dwSongFlags & SONG_FIRSTTICK)
 		{
 			// here are some really stupid things FT2 does
+			if(pChn->nRowVolCmd == VOLCMD_VOLUME) return;
 			if(pChn->nRowInstr > 0 && pChn->nRowNote == NOTE_NONE) nRetrigCount = 1;
-			if(pChn->nRowVolCmd == VOLCMD_VOLUME) nRetrigCount = -1;	// not correct yet
 			if(pChn->nRowNote != NOTE_NONE && pChn->nRowNote <= GetModSpecifications().noteMax) nRetrigCount++;
 		}
 		if (nRetrigCount >= nRetrigSpeed)


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