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

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

Revision: 296
          http://modplug.svn.sourceforge.net/modplug/?rev=296&view=rev
Author:   saga-games
Date:     2009-07-16 16:08:49 +0000 (Thu, 16 Jul 2009)

Log Message:
-----------
[Fix] Find/Replace: Made comboboxes more convenient to use
[Fix] IT compatibility: Fixed the fix for test #23

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

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2009-07-12 22:21:08 UTC (rev 295)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2009-07-16 16:08:49 UTC (rev 296)
@@ -1181,7 +1181,7 @@
     CONTROL         "Instrument",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,60,17,49,10
     COMBOBOX        IDC_COMBO2,60,28,106,103,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+                    WS_TABSTOP | CBS_SORT
     CONTROL         "Volume Effect",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,13,46,60,10
     COMBOBOX        IDC_COMBO3,13,58,94,77,CBS_DROPDOWNLIST | CBS_SORT | 
@@ -1189,7 +1189,7 @@
     CONTROL         "Volume Data",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,117,46,56,10
     COMBOBOX        IDC_COMBO4,117,58,48,77,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+                    WS_TABSTOP | CBS_SORT
     CONTROL         "Effect",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,13,78,35,10
     COMBOBOX        IDC_COMBO5,13,92,94,71,CBS_DROPDOWNLIST | CBS_SORT | 
@@ -1222,13 +1222,13 @@
     CONTROL         "Instrument",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,60,31,49,10
     COMBOBOX        IDC_COMBO2,60,42,106,92,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+                    WS_TABSTOP | CBS_SORT
     CONTROL         "Volume Effect",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,13,60,60,10
     COMBOBOX        IDC_COMBO3,13,71,94,64,CBS_DROPDOWNLIST | CBS_SORT | 
                     WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_COMBO4,117,71,48,64,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+                    WS_TABSTOP | CBS_SORT
     CONTROL         "Volume Data",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,117,60,56,10
     CONTROL         "Effect",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | 
@@ -1238,7 +1238,7 @@
     COMBOBOX        IDC_COMBO5,13,106,94,70,CBS_DROPDOWNLIST | CBS_SORT | 
                     WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_COMBO6,117,106,48,80,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+                    WS_TABSTOP | CBS_SORT
     CONTROL         "Replace By:",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,12,15,63,10
     CONTROL         "Replace All (No confirmation)",IDC_CHECK8,"Button",

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2009-07-12 22:21:08 UTC (rev 295)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2009-07-16 16:08:49 UTC (rev 296)
@@ -1927,10 +1927,6 @@
 	{
 		DoFreqSlide(pChn, -(int)(param * 4));
 	}
-
-	//IT compatibility 23. Portamento with no note
-	if((m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT)) && GetModFlag(MSF_COMPATIBLE_PLAY))
-		pChn->nPortamentoDest = 0;
 }
 
 
@@ -1972,10 +1968,6 @@
 	if (!(m_dwSongFlags & SONG_FIRSTTICK)  || (m_nMusicSpeed == 1)) {  //rewbs.PortaA01fix
 		DoFreqSlide(pChn, (int)(param << 2));
 	}
-
-	//IT compatibility 23. Portamento with no note
-	if((m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT)) && GetModFlag(MSF_COMPATIBLE_PLAY))
-		pChn->nPortamentoDest = 0;
 }
 
 void CSoundFile::MidiPortamento(MODCHANNEL *pChn, int param)
@@ -2181,6 +2173,11 @@
 			if (pChn->nPeriod < pChn->nPortamentoDest) pChn->nPeriod = pChn->nPortamentoDest;
 		}
 	}
+
+	//IT compatibility 23. Portamento with no note
+	if(pChn->nPeriod == pChn->nPortamentoDest && ((m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT))) && GetModFlag(MSF_COMPATIBLE_PLAY))
+		pChn->nPortamentoDest = 0;
+
 }
 
 


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