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

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

Revision: 371
          http://modplug.svn.sourceforge.net/modplug/?rev=371&view=rev
Author:   saga-games
Date:     2009-09-20 13:09:10 +0000 (Sun, 20 Sep 2009)

Log Message:
-----------
[Fix] Sequence Editor: Clicking on an order moved it when the mouse button was released after skipping to another order (e.g. during playback) - Bug was introduced with multi-order dragging.
[Fix] S3M Loader: Limit min sample preamp value to 0x10

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_seq.cpp
    trunk/OpenMPT/soundlib/Load_s3m.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp	2009-09-20 13:04:44 UTC (rev 370)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp	2009-09-20 13:09:10 UTC (rev 371)
@@ -659,6 +659,7 @@
 				SetCurSel(nOrder, true, ih->ShiftPressed());
 			}
 			m_bDragging = IsOrderInMargins(m_nScrollPos, oldXScroll) ? false : true;
+
 			if(m_bDragging == true)
 			{
 				m_nDragOrder = GetCurSel(true).nOrdLo;
@@ -695,8 +696,8 @@
 				// drop before or after the selection
 				bool bMoveBack = !(m_nDragOrder < (UINT)m_nDropPos);
 				// don't do anything if drop position is inside the selection
-				if(m_nDropPos >= selection.nOrdLo && m_nDropPos <= selection.nOrdHi) return;
-				// drag or order or multiple orders?
+				if(m_nDropPos >= selection.nOrdLo && m_nDropPos <= selection.nOrdHi || m_nDragOrder == m_nDropPos) return;
+				// drag one order or multiple orders?
 				bool bMultiSelection = (selection.nOrdLo != selection.nOrdHi);
 
 				for(int i = 0; i <= nMoveCount; i++)

Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp	2009-09-20 13:04:44 UTC (rev 370)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	2009-09-20 13:09:10 UTC (rev 371)
@@ -276,7 +276,7 @@
 	m_nDefaultGlobalVolume = psfh.globalvol << 2;
 	if(!m_nDefaultGlobalVolume && psfh.cwtv < 0x1320) m_nDefaultGlobalVolume = 256; // not very reliable, but it fixes a few tunes
 	if(m_nDefaultGlobalVolume > 256) m_nDefaultGlobalVolume = 256;
-	m_nSamplePreAmp = psfh.mastervol & 0x7F; // Bit 8 = Stereo (we always use stereo)
+	m_nSamplePreAmp = CLAMP(psfh.mastervol & 0x7F, 0x10, 0x7F); // Bit 8 = Stereo (we always use stereo)
 	// Channels
 	m_nChannels = 4;
 	for (UINT ich=0; ich<32; ich++)


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