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

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

Revision: 1253
          http://modplug.svn.sourceforge.net/modplug/?rev=1253&view=rev
Author:   saga-games
Date:     2012-04-21 23:08:23 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
[Fix] FT2 compatibility: Semi-fixed global volume (not applied on first tick anymore). Test case: GlobalVolume.xm

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

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2012-04-21 17:39:42 UTC (rev 1252)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2012-04-21 23:08:23 UTC (rev 1253)
@@ -2153,6 +2153,14 @@
 // 				break;
 // 			}
 			
+			// FT2 compatibility: Global volume is applied *after* the first tick.
+			// This is not emulated quite correctly for speed 1 (because there is no second tick), but it should be close enough.
+			// Test case: GlobalVolume.xm
+			if(IsCompatibleMode(TRK_FASTTRACKER2) && (m_dwSongFlags & SONG_FIRSTTICK) && m_nMusicSpeed > 1)
+			{
+				break;
+			}
+			
 			if (!(GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT))) param *= 2;
 
 			// IT compatibility 16. FT2, ST3 and IT ignore out-of-range values.

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