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

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

Revision: 308
          http://modplug.svn.sourceforge.net/modplug/?rev=308&view=rev
Author:   saga-games
Date:     2009-07-28 13:34:18 +0000 (Tue, 28 Jul 2009)

Log Message:
-----------
[Fix] S3M Saving: Patterns are now saved correctly. Previously, the last few rows might have come up as garbage in ST3, especially (only?) when they were empty.
[Imp] S3M Saving: Using an own version number in the header now, just like all the other trackers.
[Fix] IT Compatibility: Pattern loop count won't be reset on pattern transition (fixes gm-trippy01.it)

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Load_s3m.cpp
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp	2009-07-27 21:02:38 UTC (rev 307)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	2009-07-28 13:34:18 UTC (rev 308)
@@ -12,6 +12,9 @@
 #include "sndfile.h"
 #include "../mptrack/moddoc.h"
 #include "../mptrack/misc_util.h"
+#ifndef MODPLUG_NO_FILESAVE
+#include "../mptrack/version.h"
+#endif
 
 #pragma warning(disable:4244) //"conversion from 'type1' to 'type2', possible loss of data"
 
@@ -509,8 +512,13 @@
 	header[0x25] = nbp >> 8;
 	if (m_dwSongFlags & SONG_FASTVOLSLIDES) header[0x26] |= 0x40;
 	if ((m_nMaxPeriod < 20000) || (m_dwSongFlags & SONG_AMIGALIMITS)) header[0x26] |= 0x10;
-	header[0x28] = 0x20;
-	header[0x29] = 0x13;
+
+	// Version info following: ST3.20 = 0x1320
+	// Most significant nibble: 1 = ST3, 2 = Orpheus, 3 = IT, 4 = Schism, 5 = MPT
+	// Following: One nibble = Major version, one byte = Minor version
+	MptVersion::VersionNum vVersion = MptVersion::num;
+	header[0x28] = (BYTE)((vVersion >> 16) & 0xFF); // the "17" in OpenMPT 1.17
+	header[0x29] = 0x50 | (BYTE)((vVersion >> 24) & 0x0F); // the "1" in OpenMPT 1.17 + OpenMPT Identifier 5 (works only for versions up to 15.255 :))
 	header[0x2A] = 0x02; // Version = 1 => Signed samples
 	header[0x2B] = 0x00;
 	header[0x2C] = 'S';
@@ -558,11 +566,11 @@
 	ofs1 = ftell(f);
 	fwrite(insex, nbi, 0x50, f);
 	// Packing patterns
-	ofs += nbi*0x50;
-	for (i=0; i<nbp; i++)
+	ofs += nbi * 0x50;
+	for (i = 0; i < nbp; i++)
 	{
 		WORD len = 64;
-		vector<BYTE> buffer(5*1024, 0);
+		vector<BYTE> buffer(5 * 1024, 0);
 		patptr[i] = ofs / 16;
 		if (Patterns[i])
 		{
@@ -581,16 +589,18 @@
 					UINT param = m->param;
 
 					if ((note) || (m->instr)) b |= 0x20;
-					if (!note) note = 0xFF; else
-					if (note >= 0xFE) note = 0xFE; else
-					if (note < 13) note = 0; else note -= 13;
+
+					if (!note) note = 0xFF; // no note
+					else if (note >= NOTE_MIN_SPECIAL) note = 0xFE; // special notes (notecut, noteoff etc)
+					else if (note < 13) note = 0; // too low
+					else note -= 13;
+
 					if (note < 0xFE) note = (note % 12) + ((note / 12) << 4);
 					if (command == CMD_VOLUME)
 					{
 						command = 0;
-						if (param > 64) param = 64;
 						volcmd = VOLCMD_VOLUME;
-						vol = param;
+						vol = min(param, 64);
 					}
 					if (volcmd == VOLCMD_VOLUME) b |= 0x40; else
 					if (volcmd == VOLCMD_PANNING) { vol |= 0x80; b |= 0x40; }
@@ -629,9 +639,9 @@
 				}
 			}
 		}
-		buffer[0] = (len - 2) & 0xFF;
-		buffer[1] = (len - 2) >> 8;
-		len = (len+15) & (~0x0F);
+		buffer[0] = (len) & 0xFF;
+		buffer[1] = (len) >> 8;
+		len = (len + 15) & (~0x0F);
 		fwrite(&buffer[0], len, 1, f);
 		ofs += len;
 	}

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2009-07-27 21:02:38 UTC (rev 307)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2009-07-28 13:34:18 UTC (rev 308)
@@ -1568,7 +1568,7 @@
 			}
 			if(GetModFlag(MSF_COMPATIBLE_PLAY) && (m_nType & (MOD_TYPE_IT|MOD_TYPE_MPT)))
 			{
-				//IT compatibility 15. Retrigger
+				// IT compatibility 15. Retrigger
 				if (param)
 					pChn->nRetrigParam = (BYTE)(param & 0xFF);
 
@@ -1581,7 +1581,7 @@
 			}
 			else
 			{
-				//MPT Retrig
+				// XM Retrig
 				if (param) pChn->nRetrigParam = (BYTE)(param & 0xFF); else param = pChn->nRetrigParam;
 				//rewbs.volOffset
 				//RetrigNote(nChn, param);
@@ -1875,7 +1875,7 @@
 			//end rewbs.fix 
 			 && ((nPosJump != (int)m_nCurrentPattern) || (nBreakRow != (int)m_nRow)))
 			{
-				if (nPosJump != (int)m_nCurrentPattern)
+				if (nPosJump != (int)m_nCurrentPattern && !((m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT)) && GetModFlag(MSF_COMPATIBLE_PLAY)))
 				{
 					for (UINT i=0; i<m_nChannels; i++) Chn[i].nPatternLoopCount = 0;
 				}


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