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

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

Revision: 862
          http://modplug.svn.sourceforge.net/modplug/?rev=862&view=rev
Author:   saga-games
Date:     2011-05-02 21:13:34 +0000 (Mon, 02 May 2011)

Log Message:
-----------
[Fix] Pattern Editor: Dropping a channel header on the plugin buttons below the channels also moved it.
[Imp] IT / S3M Loaders: Clearing the MIDI macros only clears the Zxx part now.

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

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2011-05-02 17:40:15 UTC (rev 861)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2011-05-02 21:13:34 UTC (rev 862)
@@ -1184,7 +1184,7 @@
 				pModDoc->MuteChannel(nItemNo, !pModDoc->IsChannelMuted(nItemNo));
 				pModDoc->UpdateAllViews(this, HINT_MODCHANNELS | ((nItemNo / CHANNELS_IN_TAB) << HINT_SHIFT_CHNTAB));
 			}
-		} else if(nTargetNo < pModDoc->GetNumChannels())
+		} else if(nTargetNo < pModDoc->GetNumChannels() && (m_nDropItem & DRAGITEM_MASK) == DRAGITEM_CHNHEADER)
 		{
 			// Dragged to other channel header => move or copy channel
 
@@ -5230,7 +5230,7 @@
 
 
 bool CViewPattern::BuildChannelControlCtxMenu(HMENU hMenu)
-//--------------------------------------------------------------------
+//--------------------------------------------------------
 {
 	AppendMenu(hMenu, MF_SEPARATOR, 0, "");
 

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2011-05-02 17:40:15 UTC (rev 861)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2011-05-02 21:13:34 UTC (rev 862)
@@ -803,7 +803,8 @@
 	// Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns.
 	if (pifh->cwtv < 0x0214)
 	{
-		MemsetZero(m_MidiCfg);
+		MemsetZero(m_MidiCfg.szMidiSFXExt);
+		MemsetZero(m_MidiCfg.szMidiZXXExt);
 		m_dwSongFlags |= SONG_EMBEDMIDICFG;
 	}
 

Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp	2011-05-02 17:40:15 UTC (rev 861)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	2011-05-02 21:13:34 UTC (rev 862)
@@ -262,8 +262,11 @@
 		bKeepMidiMacros = true; // simply load Zxx commands
 	}
 
-	if(!bKeepMidiMacros) // Remove macros so they don't interfere with other tunes
-		memset(&m_MidiCfg, 0, sizeof(m_MidiCfg));
+	if(!bKeepMidiMacros) // Remove macros so they don't interfere with tunes made in trackers that don't support Zxx
+	{
+		MemsetZero(m_MidiCfg.szMidiSFXExt);
+		MemsetZero(m_MidiCfg.szMidiZXXExt);
+	}
 
 	dwMemPos = 0x60;
 	m_nType = MOD_TYPE_S3M;


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