vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2f107db...5202af9

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-18 21:42:26 +02:00
parent 58c92888b7
commit 044fd3344b
395 changed files with 27417 additions and 19754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Utils/Rand.cs
+7 -17
View File
@@ -13,8 +13,8 @@ namespace Barotrauma
ClientOnly = 1 //set to match between clients (used for misc elements that the server doesn't track, but clients want to match anyway)
}
private static Random localRandom = new Random();
private static Random[] syncedRandom = new MTRandom[] {
private static readonly Random localRandom = new Random();
private static readonly Random[] syncedRandom = new MTRandom[] {
new MTRandom(), new MTRandom()
};
@@ -29,22 +29,16 @@ namespace Barotrauma
syncedRandom[(int)RandSync.ClientOnly] = new MTRandom(seed);
}
private static void Assert(RandSync sync)
{
//TODO: REMOVE AFTER FINDING ALL WRONG RNG USAGE
#if false
string trace = Environment.StackTrace.ToString();
if (sync != RandSync.Server) return;
if (trace.ToLower().Contains("barotraumaclient\\source")) DebugConsole.NewMessage("WARNING: Client code using RandSync.Server\n"+trace,Color.Yellow);
#endif
}
public static float Range(float minimum, float maximum, RandSync sync=RandSync.Unsynced)
{
Assert(sync);
return (float)(sync == RandSync.Unsynced ? localRandom : (syncedRandom[(int)sync])).NextDouble() * (maximum - minimum) + minimum;
}
public static double Range(double minimum, double maximum, RandSync sync = RandSync.Unsynced)
{
return (sync == RandSync.Unsynced ? localRandom : (syncedRandom[(int)sync])).NextDouble() * (maximum - minimum) + minimum;
}
public static double Range(double minimum, double maximum, RandSync sync = RandSync.Unsynced)
{
Assert(sync);
@@ -53,19 +47,16 @@ namespace Barotrauma
public static int Range(int minimum, int maximum, RandSync sync = RandSync.Unsynced)
{
Assert(sync);
return (sync == RandSync.Unsynced ? localRandom : (syncedRandom[(int)sync])).Next(maximum - minimum) + minimum;
}
public static int Int(int max, RandSync sync = RandSync.Unsynced)
{
Assert(sync);
return (sync == RandSync.Unsynced ? localRandom : (syncedRandom[(int)sync])).Next(max);
}
public static Vector2 Vector(float length, RandSync sync = RandSync.Unsynced)
{
Assert(sync);
Vector2 randomVector = new Vector2(Range(-1.0f, 1.0f, sync), Range(-1.0f, 1.0f, sync));
if (randomVector.LengthSquared() < 0.001f) return new Vector2(0.0f, length);
@@ -95,7 +86,6 @@ namespace Barotrauma
public static DoubleVector2 Vector(double length, RandSync sync = RandSync.Unsynced)
{
Assert(sync);
double x = Range(-1.0, 1.0, sync);
double y = Range(-1.0, 1.0, sync);