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

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

Revision: 534
          http://modplug.svn.sourceforge.net/modplug/?rev=534&view=rev
Author:   saga-games
Date:     2010-03-17 23:18:14 +0000 (Wed, 17 Mar 2010)

Log Message:
-----------
[Fix] Pattern Editor: In the note properties, the Gxx effect for XM files was not limited properly.
[Imp] Pattern Editor: Instead of simply ignoring note off/cut/fade when working with .MOD files, it is converted to C00.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/View_pat.cpp

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2010-03-15 20:27:57 UTC (rev 533)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2010-03-17 23:18:14 UTC (rev 534)
@@ -2288,7 +2288,7 @@
 			else nmax = 0xFF;
 			break;
 		case CMD_GLOBALVOLUME:
-			nmax = (nType & MOD_TYPE_IT | MOD_TYPE_MPT) ? 128 : 64;
+			nmax = (nType & (MOD_TYPE_IT|MOD_TYPE_MPT)) ? 128 : 64;
 			break;
 
 		case CMD_MODCMDEX:

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2010-03-15 20:27:57 UTC (rev 533)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2010-03-17 23:18:14 UTC (rev 534)
@@ -4157,6 +4157,14 @@
 		else if( note < pSndFile->GetModSpecifications().noteMin)
 			note = pSndFile->GetModSpecifications().noteMin;
 
+		// Special case: Convert note off commands to C00 for MOD files
+		if((pSndFile->GetType() == MOD_TYPE_MOD) && (note == NOTE_NOTECUT || note == NOTE_FADE || note == NOTE_KEYOFF))
+		{
+			TempEnterFX(CMD_VOLUME);
+			TempEnterFXparam(0);
+			return;
+		}
+
 		// Check whether the module format supports the note.
 		if( pSndFile->GetModSpecifications().HasNote(note) == false )
 			return;


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