Ticket #3578: sound.patch

source/soundmanager/scripting/SoundGroup.cpp

@@ -38 +38 @@
 #include "ps/XML/Xeromyces.h"
 #include "soundmanager/items/ISoundItem.h"
 #include "soundmanager/SoundManager.h"
+#include "simulation2/system/Component.h" 
+#include "simulation2/components/ICmpVisual.h"
 
+#include <boost/random/mersenne_twister.hpp>
+#include <boost/random/uniform_real.hpp>
+
 #include <algorithm>
 
 
@@ -46 +51 @@
 
 #define PI 3.14126f
 
+typedef boost::mt19937 rng_t;
 
+
 static const bool DISABLE_INTENSITY = true; // disable for now since it's broken
 
 void CSoundGroup::SetGain(float gain)
@@ -96 +103 @@
 }
 
 #if CONFIG2_AUDIO
-static float RandFloat(float min, float max)
-{
-    return float(rand(min*100.0f, max*100.0f) / 100.0f);
+static float RandFloat(rng_t* rng, float min, float max) {
+    boost::uniform_real<> uni_dist(min, max);
+    return float(uni_dist(rng));
 }
 #endif // CONFIG2_AUDIO
 
@@ -203 +210 @@
         hSound->SetRollOff(itemRollOff);
     }
 
+
+    rng_t rng;
+    if (TestFlag(eRandPitch) || TestFlag(eRandGain)) {
+        // Seed random number generator
+        CmpPtr<ICmpVisual> cmpVisual(*g_Game->GetSimulation2(), source);
+        rng.seed(cmpVisual ? cmpVisual->GetActorSeed() : rand(0, 1000));
+    }
+
     if (TestFlag(eRandPitch))
-        hSound->SetPitch(RandFloat(m_PitchLower, m_PitchUpper));
+        hSound->SetPitch(RandFloat(&rng, m_PitchLower, m_PitchUpper));
     else
         hSound->SetPitch(m_Pitch);
 
     ALfloat theGain = m_Gain;
     if (TestFlag(eRandGain))
-        theGain = RandFloat(m_GainLower, m_GainUpper);
+        theGain = RandFloat(&rng, m_GainLower, m_GainUpper);
 
     hSound->SetCone(m_ConeInnerAngle, m_ConeOuterAngle, m_ConeOuterGain);
     ((CSoundManager*)g_SoundManager)->PlayGroupItem(hSound, theGain);