[OMPT-svn-commit] OpenMPT r21156 - in trunk/OpenMPT: mptrack soundlib

[<sv...@op...>]

Author: sagamusix
Date: Sat Jul 13 21:45:55 2024
New Revision: 21156
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21156

Log:
[Mod] Mod Conversion: Don't warn about broken note map for notes that are not mapped to a sample anyway.
[Ref] Small unrelated cleanups.

Modified:
   trunk/OpenMPT/mptrack/Image.cpp
   trunk/OpenMPT/mptrack/ModConvert.cpp
   trunk/OpenMPT/mptrack/Moddoc.cpp
   trunk/OpenMPT/soundlib/Load_dbm.cpp
   trunk/OpenMPT/soundlib/modcommand.cpp

Modified: trunk/OpenMPT/mptrack/Image.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Image.cpp	Sat Jul 13 19:53:36 2024	(r21155)
+++ trunk/OpenMPT/mptrack/Image.cpp	Sat Jul 13 21:45:55 2024	(r21156)
@@ -9,8 +9,8 @@
 
 
 #include "stdafx.h"
-#include "MPTrackUtil.h"
 #include "Image.h"
+#include "MPTrackUtil.h"
 #include "../common/FileReader.h"
 #include "../common/ComponentManager.h"
 

Modified: trunk/OpenMPT/mptrack/ModConvert.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/ModConvert.cpp	Sat Jul 13 19:53:36 2024	(r21155)
+++ trunk/OpenMPT/mptrack/ModConvert.cpp	Sat Jul 13 21:45:55 2024	(r21156)
@@ -411,7 +411,7 @@
 		{
 			for(size_t i = 0; i < std::size(pIns->NoteMap); i++)
 			{
-				if (pIns->NoteMap[i] && pIns->NoteMap[i] != (i + 1))
+				if(pIns->Keyboard[i] && pIns->NoteMap[i] && pIns->NoteMap[i] != (i + NOTE_MIN))
 				{
 					warnings.set(wBrokenNoteMap);
 					break;

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	Sat Jul 13 19:53:36 2024	(r21155)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	Sat Jul 13 21:45:55 2024	(r21156)
@@ -1282,7 +1282,7 @@
 {
 	for(ModChannel &chn : m_SndFile.m_PlayState.BackgroundChannels(m_SndFile))
 	{
-		if(chn.isPreviewNote && chn.nLength != 0 && !chn.dwFlags[CHN_NOTEFADE | CHN_KEYOFF| CHN_MUTE]
+		if(chn.isPreviewNote && chn.nLength != 0 && !chn.dwFlags[CHN_NOTEFADE | CHN_KEYOFF | CHN_MUTE]
 		   && (note == chn.nNewNote || note == NOTE_NONE)
 		   && (chn.pModSample == &m_SndFile.GetSample(nsmp) || !nsmp)
 		   && (chn.pModInstrument == m_SndFile.Instruments[nins] || !nins))

Modified: trunk/OpenMPT/soundlib/Load_dbm.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_dbm.cpp	Sat Jul 13 19:53:36 2024	(r21155)
+++ trunk/OpenMPT/soundlib/Load_dbm.cpp	Sat Jul 13 21:45:55 2024	(r21156)
@@ -573,7 +573,7 @@
 						std::swap(param1, param2);
 					} else if(cmd1 == CMD_TONEPORTAMENTO && cmd2 == CMD_OFFSET && param2 == 0)
 					{
-						// Offset + Portmaneto: Ignore portamento. If the offset command has a non-zero parameter, keep it for effect memory.
+						// Offset + Portamento: Ignore portamento. If the offset command has a non-zero parameter, keep it for effect memory.
 						cmd2 = CMD_NONE;
 					} else if(cmd2 == CMD_TONEPORTAMENTO && cmd1 == CMD_OFFSET && param1 == 0)
 					{

Modified: trunk/OpenMPT/soundlib/modcommand.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/modcommand.cpp	Sat Jul 13 19:53:36 2024	(r21155)
+++ trunk/OpenMPT/soundlib/modcommand.cpp	Sat Jul 13 21:45:55 2024	(r21156)
@@ -251,7 +251,7 @@
 
 	/////////////////////////////////////////
 	// Convert MOD / XM to S3M / IT / MPTM
-	if(oldTypeIsMOD_XM && newTypeIsS3M_IT_MPT)
+	if(!oldTypeIsS3M_IT_MPT && newTypeIsS3M_IT_MPT)
 	{
 		switch(command)
 		{
@@ -318,7 +318,7 @@
 				command = CMD_S3MCMDEX;
 				if(param == 0)
 					instr = 0;
-				param = 0xD0 | (param & 0x0F);
+				param = 0xD0 | std::min(param, PARAM(0x0F));
 			}
 			break;