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

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

Revision: 1343
          http://modplug.svn.sourceforge.net/modplug/?rev=1343&view=rev
Author:   saga-games
Date:     2012-08-20 13:24:10 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
[Fix] Pattern Editor: Cursor doesn't exceed the pattern anymore when moving it beyond the right border (fixed live at Evoke, forgot to commit :))
[Mod] Pattern Editor: Entering note stops via MIDI doesn't put an instrument number next to them anymore.
[Mod] OpenMPT: Version is now 1.20.02.06

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/View_pat.cpp
    trunk/OpenMPT/mptrack/version.h

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2012-08-05 18:41:19 UTC (rev 1342)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2012-08-20 13:24:10 UTC (rev 1343)
@@ -4268,10 +4268,17 @@
 	} else
 	{
 		// Move cursor one column to the right
-		if((CMainFrame::GetSettings().m_dwPatternSetup & PATTERN_WRAP) && (m_Cursor.CompareColumn(PatternCursor(0, GetDocument()->GetNumChannels() - 1, m_nDetailLevel)) >= 0))
+		const PatternCursor rightmost(0, GetDocument()->GetNumChannels() - 1, m_nDetailLevel);
+		if(m_Cursor.CompareColumn(rightmost) >= 0)
 		{
-			// Wrap around to first channel.
-			SetCurrentColumn(0);
+			if((CMainFrame::GetSettings().m_dwPatternSetup & PATTERN_WRAP))
+			{
+				// Wrap around to first channel.
+				SetCurrentColumn(0);
+			} else
+			{
+				SetCurrentColumn(rightmost);
+			}
 		} else
 		{
 			do
@@ -4612,8 +4619,7 @@
 			pTarget->param = 0;
 		}
 	}
-	pTarget->instr = (bChordMode) ? 0 : ins; //p->instr = 0; 
-	//Writing the instrument as well - probably someone finds this annoying :)
+	pTarget->instr = 0;	// Instrument numbers next to note-offs can do all kinds of weird things in XM files, and they are pointless anyway.
 	pTarget->volcmd	= VOLCMD_NONE;
 	pTarget->vol = 0;
 

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2012-08-05 18:41:19 UTC (rev 1342)
+++ trunk/OpenMPT/mptrack/version.h	2012-08-20 13:24:10 UTC (rev 1343)
@@ -19,7 +19,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					20
 #define VER_MINOR					02
-#define VER_MINORMINOR				05
+#define VER_MINORMINOR				06
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 

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