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

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

Revision: 717
          http://modplug.svn.sourceforge.net/modplug/?rev=717&view=rev
Author:   saga-games
Date:     2010-09-23 22:40:09 +0000 (Thu, 23 Sep 2010)

Log Message:
-----------
[New] Order list: Two new shortcuts for setting an ignore (+++) / invalid (---) pattern index.
[Mod] Updated DE_jojo.mkb (two new shortcuts for the orderlist, KeyHold for Pattern Duplicate)

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/CommandSet.cpp
    trunk/OpenMPT/mptrack/CommandSet.h
    trunk/OpenMPT/mptrack/Ctrl_seq.cpp
    trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb

Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp	2010-09-23 22:37:31 UTC (rev 716)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp	2010-09-23 22:40:09 UTC (rev 717)
@@ -599,6 +599,8 @@
 	DefineKeyCommand(kcInsNoteMapEditSampleMap, 1850, kcVisible, kcNoDummy, _T("Edit sample map"));
 	DefineKeyCommand(kcInstrumentCtrlDuplicate, 1851, kcVisible, kcNoDummy, _T("Duplicate instrument"));
 	DefineKeyCommand(kcPanic, 1852, kcVisible, kcNoDummy, _T("Panic"));
+	DefineKeyCommand(kcOrderlistPatIgnore, 1853, kcVisible, kcNoDummy, _T("Ignore (+++) Index"));
+	DefineKeyCommand(kcOrderlistPatInvalid, 1854, kcVisible, kcNoDummy, _T("Invalid (---) Index"));
 	// Add new key commands here.
 
 #ifdef _DEBUG

Modified: trunk/OpenMPT/mptrack/CommandSet.h
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h	2010-09-23 22:37:31 UTC (rev 716)
+++ trunk/OpenMPT/mptrack/CommandSet.h	2010-09-23 22:40:09 UTC (rev 717)
@@ -1035,7 +1035,9 @@
 	kcOrderlistPat9,
 	kcOrderlistPatPlus,
 	kcOrderlistPatMinus,
-	kcEndOrderlistNum=kcOrderlistPatMinus,
+	kcOrderlistPatIgnore,
+	kcOrderlistPatInvalid,
+	kcEndOrderlistNum=kcOrderlistPatInvalid,
 	kcEndOrderlistCommands=kcEndOrderlistNum,
 
 	kcNumCommands,

Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp	2010-09-23 22:37:31 UTC (rev 716)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp	2010-09-23 22:40:09 UTC (rev 717)
@@ -441,6 +441,10 @@
 		EnterPatternNum(10); return wParam;
 	case kcOrderlistPatPlus:
 		EnterPatternNum(11); return wParam;
+	case kcOrderlistPatIgnore:
+		EnterPatternNum(12); return wParam;
+	case kcOrderlistPatInvalid:
+		EnterPatternNum(13); return wParam;
 
 	// kCtxViewPatternsNote messages
 	case kcSwitchToOrderList:
@@ -487,6 +491,16 @@
 		if ((nCurNdx >= 1000) && (nCurNdx > nMaxNdx)) nCurNdx %= 1000;
 		if ((nCurNdx >= 100) && (nCurNdx > nMaxNdx)) nCurNdx %= 100;
 		if ((nCurNdx >= 10) && (nCurNdx > nMaxNdx)) nCurNdx %= 10;
+	} else if (enterNum == 10) // decrease pattern index
+	{
+		const PATTERNINDEX nFirstInvalid = pSndFile->GetModSpecifications().hasIgnoreIndex ? pSndFile->Order.GetIgnoreIndex() : pSndFile->Order.GetInvalidPatIndex();
+		if (nCurNdx == 0)
+			nCurNdx = pSndFile->Order.GetInvalidPatIndex();
+		else
+		{
+			nCurNdx--;
+			if ((nCurNdx > nMaxNdx) && (nCurNdx < nFirstInvalid)) nCurNdx = nMaxNdx;
+		}
 	} else if (enterNum == 11) // increase pattern index
 	{
 		if(nCurNdx >= pSndFile->Order.GetInvalidPatIndex())
@@ -500,16 +514,15 @@
 			if(nCurNdx > nMaxNdx && nCurNdx < nFirstInvalid)
 				nCurNdx = nFirstInvalid;
 		}
-	} else if (enterNum == 10) // decrease pattern index
+	} else if (enterNum == 12) // ignore index (+++)
 	{
-		const PATTERNINDEX nFirstInvalid = pSndFile->GetModSpecifications().hasIgnoreIndex ? pSndFile->Order.GetIgnoreIndex() : pSndFile->Order.GetInvalidPatIndex();
-		if (nCurNdx == 0)
-			nCurNdx = pSndFile->Order.GetInvalidPatIndex();
-		else
+		if (pSndFile->GetModSpecifications().hasIgnoreIndex)
 		{
-			nCurNdx--;
-			if ((nCurNdx > nMaxNdx) && (nCurNdx < nFirstInvalid)) nCurNdx = nMaxNdx;
+			nCurNdx = pSndFile->Order.GetIgnoreIndex();
 		}
+	} else if (enterNum == 13) // invalid index (---)
+	{
+		nCurNdx = pSndFile->Order.GetInvalidPatIndex();
 	}
 	// apply
 	if (nCurNdx != pSndFile->Order[m_nScrollPos])

Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb
===================================================================
--- trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb	2010-09-23 22:37:31 UTC (rev 716)
+++ trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb	2010-09-23 22:40:09 UTC (rev 717)
@@ -84,7 +84,7 @@
 2:1002:2:13:5		//Play row: Ctrl+EINGABE (KeyDown|KeyHold)
 2:1317:4:18:1		//Set row jump on note entry: Alt (KeyDown)
 2:1685:2:9:1		//Switch to order list: Ctrl+TABULATOR (KeyDown)
-2:1806:2:68:1		//Duplicate pattern: Ctrl+D (KeyDown)
+2:1806:2:68:5		//Duplicate pattern: Ctrl+D (KeyDown|KeyHold)
 2:1836:2:191:1		//Edit plugin assigned to PC note: Ctrl+# (KeyDown)
 2:1662:6:80:1		//Toggle channel's plugin editor: Ctrl+Alt+P (KeyDown)
 2:1062:0:93:1		//Show note properties: ANWENDUNG (KeyDown)
@@ -372,3 +372,5 @@
 19:1817:0:187:5		//Increase pattern index : + (KeyDown|KeyHold)
 19:1818:0:109:1		//Decrease pattern index: - (ZEHNERTASTATUR) (KeyDown)
 19:1818:0:189:1		//Decrease pattern index: - (KeyDown)
+19:1853:0:73:1		//Ignore (+++) Index: I (KeyDown)
+19:1854:0:32:1		//Invalid (---) Index: LEER (KeyDown)


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