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

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

Revision: 923
          http://modplug.svn.sourceforge.net/modplug/?rev=923&view=rev
Author:   saga-games
Date:     2011-07-22 20:54:18 +0000 (Fri, 22 Jul 2011)

Log Message:
-----------
[Ref] Moved effect colour assignment arrays from mptrack to draw_pat

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Draw_pat.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/Mptrack.h

Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp	2011-07-22 17:43:39 UTC (rev 922)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp	2011-07-22 20:54:18 UTC (rev 923)
@@ -98,7 +98,38 @@
 // some additions there.
 
 
+/////////////////////////////////////////////////////////////////////////////
+// Effect colour codes
 
+// Effect number => Effect colour assignment
+const BYTE effectColors[] =
+{
+	0,					0,					MODCOLOR_PITCH,		MODCOLOR_PITCH,
+	MODCOLOR_PITCH,		MODCOLOR_PITCH,		MODCOLOR_VOLUME,	MODCOLOR_VOLUME,
+	MODCOLOR_VOLUME,	MODCOLOR_PANNING,	0,					MODCOLOR_VOLUME,
+	MODCOLOR_GLOBALS,	MODCOLOR_VOLUME,	MODCOLOR_GLOBALS,	0,
+	MODCOLOR_GLOBALS,	MODCOLOR_GLOBALS,	0,					0,					
+	0,					MODCOLOR_VOLUME,	MODCOLOR_VOLUME,	MODCOLOR_GLOBALS,	
+	MODCOLOR_GLOBALS,	0,					MODCOLOR_PITCH,		MODCOLOR_PANNING,
+	MODCOLOR_PITCH,		MODCOLOR_PANNING,	0,					0,
+	0,					0,					0,					MODCOLOR_PITCH,
+	MODCOLOR_PITCH,
+};
+
+STATIC_ASSERT(CountOf(effectColors) == MAX_EFFECTS);
+
+// Volume effect number => Effect colour assignment
+const BYTE volEffectColors[] =
+{
+	0,					MODCOLOR_VOLUME,	MODCOLOR_PANNING,	MODCOLOR_VOLUME,
+	MODCOLOR_VOLUME,	MODCOLOR_VOLUME,	MODCOLOR_VOLUME,	MODCOLOR_PITCH,
+	MODCOLOR_PITCH,		MODCOLOR_PANNING,	MODCOLOR_PANNING,	MODCOLOR_PITCH,
+	MODCOLOR_PITCH,		MODCOLOR_PITCH,		0,					0,
+};
+
+STATIC_ASSERT(CountOf(volEffectColors) == MAX_VOLCMDS);
+
+
 /////////////////////////////////////////////////////////////////////////////
 // CViewPattern Drawing Implementation
 
@@ -930,8 +961,8 @@
 					} else
 					if ((!m->IsPcNote()) && (m->volcmd) && (m->volcmd < MAX_VOLCMDS) && (CMainFrame::m_dwPatternSetup & PATTERN_EFFECTHILIGHT))
 					{
-						if(gVolEffectColors[m->volcmd] != 0)
-							tx_col = gVolEffectColors[m->volcmd];
+						if(volEffectColors[m->volcmd] != 0)
+							tx_col = volEffectColors[m->volcmd];
 					}
 					// Drawing Volume
 					m_Dib.SetTextColor(tx_col, bk_col);
@@ -948,8 +979,8 @@
 				fx_col = row_col;
 				if (!isPCnote && (m->command) && (m->command < MAX_EFFECTS) && (CMainFrame::m_dwPatternSetup & PATTERN_EFFECTHILIGHT))
 				{
-					if(gEffectColors[m->command] != 0)
-						fx_col = gEffectColors[m->command];
+					if(effectColors[m->command] != 0)
+						fx_col = effectColors[m->command];
 				}
 				if (!(dwSpeedUpMask & 0x08))
 				{

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2011-07-22 17:43:39 UTC (rev 922)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2011-07-22 20:54:18 UTC (rev 923)
@@ -212,28 +212,6 @@
 	TEXT("C-9"), TEXT("C#9"), TEXT("D-9"), TEXT("D#9"), TEXT("E-9"), TEXT("F-9"), TEXT("F#9"), TEXT("G-9"), TEXT("G#9"), TEXT("A-9"), TEXT("A#9"), TEXT("B-9"),
 };
 
-const BYTE gEffectColors[MAX_EFFECTS] =
-{
-	0,					0,					MODCOLOR_PITCH,		MODCOLOR_PITCH,
-	MODCOLOR_PITCH,		MODCOLOR_PITCH,		MODCOLOR_VOLUME,	MODCOLOR_VOLUME,
-	MODCOLOR_VOLUME,	MODCOLOR_PANNING,	0,					MODCOLOR_VOLUME,
-	MODCOLOR_GLOBALS,	MODCOLOR_VOLUME,	MODCOLOR_GLOBALS,	0,
-	MODCOLOR_GLOBALS,	MODCOLOR_GLOBALS,	0,					0,					
-	0,					MODCOLOR_VOLUME,	MODCOLOR_VOLUME,	MODCOLOR_GLOBALS,	
-	MODCOLOR_GLOBALS,	0,					MODCOLOR_PITCH,		MODCOLOR_PANNING,
-	MODCOLOR_PITCH,		MODCOLOR_PANNING,	0,					0,
-	0,					0,					0,					MODCOLOR_PITCH,
-	MODCOLOR_PITCH,
-};
-
-const BYTE gVolEffectColors[MAX_VOLCMDS] =
-{
-	0,					MODCOLOR_VOLUME,	MODCOLOR_PANNING,	MODCOLOR_VOLUME,
-	MODCOLOR_VOLUME,	MODCOLOR_VOLUME,	MODCOLOR_VOLUME,	MODCOLOR_PITCH,
-	MODCOLOR_PITCH,		MODCOLOR_PANNING,	MODCOLOR_PANNING,	MODCOLOR_PITCH,
-	MODCOLOR_PITCH,		MODCOLOR_PITCH,		0,					0,
-};
-
 static void ShowChangesDialog()
 //-----------------------------
 {

Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h	2011-07-22 17:43:39 UTC (rev 922)
+++ trunk/OpenMPT/mptrack/Mptrack.h	2011-07-22 20:54:18 UTC (rev 923)
@@ -395,8 +395,6 @@
 ///////////////////////////////////////////////////
 // Tables
 
-extern const BYTE gEffectColors[MAX_EFFECTS];
-extern const BYTE gVolEffectColors[MAX_VOLCMDS];
 extern const LPCSTR szNoteNames[12];
 extern const LPCTSTR szDefaultNoteNames[NOTE_MAX];
 //const LPCTSTR szSpecialNoteNames[NOTE_MAX_SPECIAL - NOTE_MIN_SPECIAL + 1] = {TEXT("PCs"), TEXT("PC"), TEXT("~~"), TEXT("^^"), TEXT("==")};


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