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

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

Revision: 292
          http://modplug.svn.sourceforge.net/modplug/?rev=292&view=rev
Author:   saga-games
Date:     2009-07-11 19:18:24 +0000 (Sat, 11 Jul 2009)

Log Message:
-----------
[Fix] Tremor: Two (not too important) lines were missing

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Load_it.cpp
    trunk/OpenMPT/soundlib/Sndfile.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2009-07-11 18:53:31 UTC (rev 291)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2009-07-11 19:18:24 UTC (rev 292)
@@ -985,8 +985,6 @@
 	if (pifh->tempo) m_nDefaultTempo = pifh->tempo;
 	if(m_nDefaultTempo < 32) m_nDefaultTempo = 32; // tempo 31 is possible. due to conflicts with the rest of the engine, let's just clamp it to 32.
 
-	if(m_nDefaultTempo < 32) m_nDefaultTempo = 32; // tempo 31 is possible. due to conflicts with the rest of the engine, let's just clamp it to 32.
-
 	m_nSamplePreAmp = pifh->mv & 0x7F;
 	if (m_nSamplePreAmp<0x20) {
 		m_nSamplePreAmp=100;

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2009-07-11 18:53:31 UTC (rev 291)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2009-07-11 19:18:24 UTC (rev 292)
@@ -1135,7 +1135,7 @@
 		Chn[j].nCommand = 0;
 		Chn[j].nPatternLoopCount = 0;
 		Chn[j].nPatternLoop = 0;
-		Chn[j].nTremorCount = 0;
+		if(!GetModFlag(MSF_COMPATIBLE_PLAY)) Chn[j].nTremorCount = 0;
 	}
 	if (!nPos)
 	{
@@ -1395,7 +1395,7 @@
 		Chn[i].nPatternLoop = 0;
 		Chn[i].nFadeOutVol = 0;
 		Chn[i].dwFlags |= CHN_KEYOFF|CHN_NOTEFADE;
-		Chn[i].nTremorCount = 0;
+		Chn[i].nTremorCount = Chn[i].nTremorOn = Chn[i].nTremorOff = 0;
 	}
 
 	if(resetMask & 4)


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