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

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

Revision: 879
          http://modplug.svn.sourceforge.net/modplug/?rev=879&view=rev
Author:   saga-games
Date:     2011-05-21 00:14:21 +0000 (Sat, 21 May 2011)

Log Message:
-----------
[Fix] IMF Loader: Orpheus' 8-Bit cutoff range was not converted to MPT's 7-Bit range.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Load_imf.cpp

Modified: trunk/OpenMPT/soundlib/Load_imf.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_imf.cpp	2011-05-20 14:28:48 UTC (rev 878)
+++ trunk/OpenMPT/soundlib/Load_imf.cpp	2011-05-21 00:14:21 UTC (rev 879)
@@ -177,6 +177,9 @@
 		else
 			note->param |= 0xe0;
 		break;
+	case 0x16: // cutoff
+		note->param >>= 1;
+		break;
 	case 0x1f: // set global volume
 		note->param = min(note->param << 1, 0xff);
 		break;
@@ -352,15 +355,15 @@
 	// read patterns
 	for(PATTERNINDEX nPat = 0; nPat < hdr.patnum; nPat++)
 	{
-		UINT16 length, nrows;
+		uint16 length, nrows;
 		BYTE mask, channel;
 		int row;
 		unsigned int lostfx = 0;
 		MODCOMMAND *row_data, *note, junk_note;
 
 		ASSERT_CAN_READ(4);
-		length = LittleEndianW(*((UINT16 *)(lpStream + dwMemPos)));
-		nrows = LittleEndianW(*((UINT16 *)(lpStream + dwMemPos + 2)));
+		length = LittleEndianW(*((uint16 *)(lpStream + dwMemPos)));
+		nrows = LittleEndianW(*((uint16 *)(lpStream + dwMemPos + 2)));
 		dwMemPos += 4;
 
 		if(Patterns.Insert(nPat, nrows))
@@ -531,7 +534,7 @@
 		for(SAMPLEINDEX nSmp = 0; nSmp < imfins.smpnum; nSmp++)
 		{
 			IMFSAMPLE imfsmp;
-			UINT32 blen;
+			uint32 blen;
 			ASSERT_CAN_READ(sizeof(IMFSAMPLE));
 			memset(&imfsmp, 0, sizeof(IMFSAMPLE));
 			memcpy(&imfsmp, lpStream + dwMemPos, sizeof(IMFSAMPLE));


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