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

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

Revision: 556
          http://modplug.svn.sourceforge.net/modplug/?rev=556&view=rev
Author:   saga-games
Date:     2010-03-27 20:21:45 +0000 (Sat, 27 Mar 2010)

Log Message:
-----------
[Fix] Note Properties: Vibrato and Tremolo were erroneously marked as commands with no effect memory.
[New] Pattern Editor: When the PT1x mode or the S3M "Amiga" flag are enabled, dodgy notes (i.e lower than C-4 or higher than B-6) are marked red.

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

Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp	2010-03-26 23:11:20 UTC (rev 555)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp	2010-03-27 20:21:45 UTC (rev 556)
@@ -131,6 +131,7 @@
 	b = hilightcolor(GetBValue(CMainFrame::rgbCustomColors[MODCOLOR_BACKHILIGHT]),
 					GetBValue(CMainFrame::rgbCustomColors[MODCOLOR_BACKNORMAL]));
 	m_Dib.SetColor(MODCOLOR_2NDHIGHLIGHT, RGB(r,g,b));
+	m_Dib.SetColor(MODCOLOR_DODGY_COMMANDS, RGB(255, 0, 0));
 	m_Dib.SetBlendColor(CMainFrame::rgbCustomColors[MODCOLOR_BLENDCOLOR]);
 }
 
@@ -845,6 +846,9 @@
 				if ((CMainFrame::m_dwPatternSetup & PATTERN_EFFECTHILIGHT) && (m->note) && (m->note <= NOTE_MAX))
 				{
 					tx_col = MODCOLOR_NOTE;
+					// Highlight notes that are not supported by the Amiga
+					if((pSndFile->m_dwSongFlags & (SONG_PT1XMODE|SONG_AMIGALIMITS)) && (m->note < NOTE_MIDDLEC - 12 || m->note >= NOTE_MIDDLEC + 2 * 12))
+						tx_col = MODCOLOR_DODGY_COMMANDS;
 				}
 				if (col_sel & 0x01)
 				{

Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h	2010-03-26 23:11:20 UTC (rev 555)
+++ trunk/OpenMPT/mptrack/Mainfrm.h	2010-03-27 20:21:45 UTC (rev 556)
@@ -156,6 +156,7 @@
 	MAX_MODCOLORS,
 	// Internal color codes
 	MODCOLOR_2NDHIGHLIGHT,
+	MODCOLOR_DODGY_COMMANDS,
 	MAX_MODPALETTECOLORS
 };
 

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2010-03-26 23:11:20 UTC (rev 555)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2010-03-27 20:21:45 UTC (rev 556)
@@ -2461,7 +2461,7 @@
 		if (param)
 			wsprintf(s, "speed %d", param);
 		else
-			strcpy(s, szContinueOrIgnore);
+			strcpy(s, "continue");
 		break;
 
 	case CMD_VIBRATO:
@@ -2471,7 +2471,7 @@
 		if (param)
 			wsprintf(s, "speed=%d depth=%d", param >> 4, param & 0x0F);
 		else
-			strcpy(s, szContinueOrIgnore);
+			strcpy(s, "continue");
 		break;
 
 	case CMD_SPEED:


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