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

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

Revision: 481
          http://modplug.svn.sourceforge.net/modplug/?rev=481&view=rev
Author:   saga-games
Date:     2010-01-27 20:27:41 +0000 (Wed, 27 Jan 2010)

Log Message:
-----------
[Imp] Mod Conversion: Don't show warning about restart position if it is actually not set (only applies to S3M format)
[Fix] PSM16 Loader: Fix for note cut on tick 0 (warbot tune from Silverball)
[Imp] Improved HasNote function in Mod Specs
[Fix] Corrected original XM specs.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Modedit.cpp
    trunk/OpenMPT/soundlib/Load_psm.cpp
    trunk/OpenMPT/soundlib/mod_specifications.cpp
    trunk/OpenMPT/soundlib/mod_specifications.h

Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp	2010-01-26 21:25:38 UTC (rev 480)
+++ trunk/OpenMPT/mptrack/Modedit.cpp	2010-01-27 20:27:41 UTC (rev 481)
@@ -345,7 +345,7 @@
 	}
 
 	// Is the "restart position" value allowed in this format?
-	if(CSoundFile::GetModSpecifications(nNewType).hasRestartPos == false)
+	if(m_SndFile.m_nRestartPos > 0 && !CSoundFile::GetModSpecifications(nNewType).hasRestartPos)
 	{
 		m_SndFile.m_nRestartPos = 0;
 		AddToLog("WARNING: Restart position is not support by the new format.\n");

Modified: trunk/OpenMPT/soundlib/Load_psm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_psm.cpp	2010-01-26 21:25:38 UTC (rev 480)
+++ trunk/OpenMPT/soundlib/Load_psm.cpp	2010-01-27 20:27:41 UTC (rev 481)
@@ -360,7 +360,7 @@
 								
 								default: // How the hell should this happen? I've listened through almost all existing (original) PSM files. :)
 									CString s;
-									s.Format("Please report to the OpenMPT team: Unknown chunk %d found at position %d (in the OPLH chunk of this PSM file)", lpStream[dwSettingsOffset], dwSettingsOffset);
+									s.Format("Report to the OpenMPT team: Unknown chunk %d found at position %d (in the OPLH chunk of this PSM file)", lpStream[dwSettingsOffset], dwSettingsOffset);
 									MessageBox(NULL, s, TEXT("OpenMPT PSM import"), MB_ICONERROR);
 									// anyway, in such cases, we have to quit as we don't know how big the chunk really is.
 									return false;
@@ -1131,6 +1131,7 @@
 						break;
 					case 0x2A: // note cut
 						command = CMD_S3MCMDEX;
+						if(param == 0) param = 1;
 						param |= 0xC0;
 						break;
 					case 0x2B: // note delay

Modified: trunk/OpenMPT/soundlib/mod_specifications.cpp
===================================================================
--- trunk/OpenMPT/soundlib/mod_specifications.cpp	2010-01-26 21:25:38 UTC (rev 480)
+++ trunk/OpenMPT/soundlib/mod_specifications.cpp	2010-01-27 20:27:41 UTC (rev 481)
@@ -17,7 +17,8 @@
 			return hasNoteFade;
 		else
 			return (memcmp(fileExtension, ModSpecs::mptm.fileExtension, 4) == 0);
-	}
+	} else if(note == NOTE_NONE)
+		return true;
 	return false;
 }
 

Modified: trunk/OpenMPT/soundlib/mod_specifications.h
===================================================================
--- trunk/OpenMPT/soundlib/mod_specifications.h	2010-01-26 21:25:38 UTC (rev 480)
+++ trunk/OpenMPT/soundlib/mod_specifications.h	2010-01-27 20:27:41 UTC (rev 481)
@@ -52,7 +52,7 @@
 const CModSpecifications mptm =
 {
 	/*
-	TODO: Proper, less arbitrarily chosen, values here.
+	TODO: Proper, less arbitrarily chosen values here.
 	NOTE: If changing limits, see whether:
 			-savefile format and GUI methods can handle new values(might not be a small task :).
 	 */
@@ -78,7 +78,7 @@
 	1,									//Min Speed
 	255,								//Max Speed
 	true,								//Has song comments
-	240,								//Envelope point count
+	MAX_ENVPOINTS,						//Envelope point count
 	" JFEGHLKRXODB?CQATI?SMNVW?UY?P?Z\\:#",	// Supported Effects
 	" vpcdabuhlrgfe:o",					// Supported Volume Column commands
 	true,								// Has "+++" pattern
@@ -171,15 +171,15 @@
 	1,									//Min pattern rows
 	256,								//Max pattern rows
     20,									//Max mod name length
-	31,									//SamplesMax
-	200,								//instrumentMax
+	31,									//SamplesMax (actually 16 per instrument)
+	128,								//instrumentMax
 	mixLevels_original,					//defaultMixLevels
 	0,									//Max MIDI mapping directives
 	1,									//Min Speed
 	31,									//Max Speed
 	false,								//No song comments
 	12,									//Envelope point count
-	" 0123456789ABCDRFFTE???GHK?YXPLZ\\:#",	// Supported Effects
+	" 0123456789ABCDRFFTE???GHK??XPL????",	// Supported Effects
 	" vpcdabuhlrg????",					// Supported Volume Column commands
 	false,								// Doesn't have "+++" pattern
 	true,								// Has restart position (order)


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