Ticket #3578: patch2.patch

source/lib/rand.cpp

@@ -1 @@
-/* Copyright (c) 2010 Wildfire Games
+/* Copyright (c) 2015 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -7 +7 @@
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -72 +72 @@
         x = xrand();
     }
     while(x >= range * inv_range);
-    x /= inv_range;
+    x %= range;
 
     x += min_inclusive;
     ENSURE(x < max_exclusive);

source/soundmanager/scripting/SoundGroup.cpp

@@ -39 +39 @@
 #include "soundmanager/items/ISoundItem.h"
 #include "soundmanager/SoundManager.h"
 
+#include "simulation2/system/Component.h"
+#include "simulation2/components/ICmpVisual.h"
+
 #include <algorithm>
 
 
@@ -203 +206 @@
         hSound->SetRollOff(itemRollOff);
     }
 
+    if (TestFlag(eRandPitch) || TestFlag(eRandGain)) {
+        CmpPtr<ICmpVisual> cmpVisual(*g_Game->GetSimulation2(), source);
+        if (cmpVisual)
+            srand(cmpVisual->GetActorSeed());
+    }
+
     if (TestFlag(eRandPitch))
         hSound->SetPitch(RandFloat(m_PitchLower, m_PitchUpper));
     else