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

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

Revision: 1992
          http://sourceforge.net/p/modplug/code/1992
Author:   saga-games
Date:     2013-04-28 14:34:58 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
[Imp] DMF Loader: Offset without note should now work.
[Ref] Got rid of some compiler warnings.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/LOAD_DMF.CPP
    trunk/OpenMPT/soundlib/Load_gdm.cpp
    trunk/OpenMPT/soundlib/load_j2b.cpp
    trunk/OpenMPT/unarchiver/unzip.cpp

Modified: trunk/OpenMPT/soundlib/LOAD_DMF.CPP
===================================================================
--- trunk/OpenMPT/soundlib/LOAD_DMF.CPP	2013-04-28 10:11:05 UTC (rev 1991)
+++ trunk/OpenMPT/soundlib/LOAD_DMF.CPP	2013-04-28 14:34:58 UTC (rev 1992)
@@ -680,6 +680,11 @@
 							}
 						}
 						effect1 = CMD_OFFSET;
+						if(m->note == NOTE_NONE)
+						{
+							// Offset without note does also work in DMF.
+							m->note = settings.channels[chn].lastNote;
+						}
 						settings.channels[chn].playDir = false;
 						break;
 					case 10:	// Invert Sample play direction ("Tekkno Invert")

Modified: trunk/OpenMPT/soundlib/Load_gdm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_gdm.cpp	2013-04-28 10:11:05 UTC (rev 1991)
+++ trunk/OpenMPT/soundlib/Load_gdm.cpp	2013-04-28 14:34:58 UTC (rev 1992)
@@ -169,7 +169,7 @@
 		ChnSettings[i].Reset();
 		if(fileHeader.panMap[i] < 16)
 		{
-			ChnSettings[i].nPan = std::min((fileHeader.panMap[i] * 16) + 8, 256);
+			ChnSettings[i].nPan = static_cast<uint16>(std::min((fileHeader.panMap[i] * 16) + 8, 256));
 		} else if(fileHeader.panMap[i] == 16)
 		{
 			ChnSettings[i].nPan = 128;

Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp	2013-04-28 10:11:05 UTC (rev 1991)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp	2013-04-28 14:34:58 UTC (rev 1992)
@@ -801,7 +801,7 @@
 			if(pan >= 128)
 				ChnSettings[nChn].dwFlags = CHN_MUTE;
 			else
-				ChnSettings[nChn].nPan = std::min(pan * 4, 256);
+				ChnSettings[nChn].nPan = static_cast<uint16>(std::min(pan * 4, 256));
 		}
 	}
 

Modified: trunk/OpenMPT/unarchiver/unzip.cpp
===================================================================
--- trunk/OpenMPT/unarchiver/unzip.cpp	2013-04-28 10:11:05 UTC (rev 1991)
+++ trunk/OpenMPT/unarchiver/unzip.cpp	2013-04-28 14:34:58 UTC (rev 1992)
@@ -158,7 +158,7 @@
 		while(ext > name)
 		{
 			ext--;
-			*ext = tolower(*ext);
+			*ext = static_cast<char>(tolower(*ext));
 			if(*ext == '.')
 			{
 				ext++;

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