eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-29 17:27:30 +01:00
Code Issues 154 Wiki Activity

use random_device for local generator

Browse Source
This commit is contained in:
maj00r
2026-09-14 19:11:07 +02:00
parent 1c2f397fc5
commit 2945f3f9b2
4 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/application.cpp
View File

@@ -320,9 +320,11 @@ int eu07_application::init(int Argc, char *Argv[])
return result; return result;
} }
// the run's seed, settled once and kept in Globals: the engines come out of it
if (!Global.random_seed) if (!Global.random_seed)
Global.random_seed = clock_seed(); Global.random_seed = std::random_device{}();
Global.random_engine.seed(Global.random_seed); Global.random_engine.seed(Global.random_seed);
Global.local_random_engine.seed(Global.random_seed);
// configure the OS console according to Globals.ShowSystemConsole. // configure the OS console according to Globals.ShowSystemConsole.
// must run AFTER init_settings (so the ini-loaded value is honoured) and // must run AFTER init_settings (so the ini-loaded value is honoured) and
@@ -1432,7 +1434,6 @@ int eu07_application::init_data()
int eu07_application::init_modes() int eu07_application::init_modes()
{ {
Global.local_random_engine.seed(clock_seed());
if ((!Global.network_servers.empty() || Global.network_client) && Global.SceneryFile.empty()) if ((!Global.network_servers.empty() || Global.network_client) && Global.SceneryFile.empty())
{ {

9
utilities/utilities.cpp
View File

@@ -16,7 +16,6 @@ Copyright (C) 2007-2014 Maciej Cierniak
//#include <sys/types.h> //#include <sys/types.h>
//#include <sys/stat.h> //#include <sys/stat.h>
#include <charconv> #include <charconv>
#include <ctime>
#include <ranges> #include <ranges>
//#ifndef WIN32 //#ifndef WIN32
//#include <unistd.h> //#include <unistd.h>
@@ -138,12 +137,6 @@ int Random(int min, int max)
return dist(Global.random_engine); return dist(Global.random_engine);
} }
std::uint32_t clock_seed()
{
static std::atomic<std::uint32_t> nth{0};
return static_cast<std::uint32_t>(std::time({})) + nth.fetch_add(1, std::memory_order_relaxed);
}
std::uint32_t seed_of(std::string const &Text) std::uint32_t seed_of(std::string const &Text)
{ {
std::uint32_t number{}; std::uint32_t number{};
@@ -161,7 +154,7 @@ std::uint32_t seed_of(std::string const &Text)
std::string generate_uuid_v4() std::string generate_uuid_v4()
{ {
static thread_local std::mt19937 generator{clock_seed()}; static thread_local std::mt19937 generator{std::random_device{}()};
std::uniform_int_distribution<int> dist(0, 255); std::uniform_int_distribution<int> dist(0, 255);
std::array<uint8_t, 16> bytes; std::array<uint8_t, 16> bytes;

4
utilities/utilities.h
View File

@@ -63,10 +63,6 @@ inline long Round(double const f)
double Random(double a, double b); double Random(double a, double b);
int Random(int min, int max); int Random(int min, int max);
// Seed for the random engines: the clock, plus a counter so two engines seeded in
// the same second do not come out the same.
std::uint32_t clock_seed();
// The seed a word stands for. A number is taken as it is written; anything else is // The seed a word stands for. A number is taken as it is written; anything else is
// hashed the way Java's String.hashCode does it, so the same word gives the same // hashed the way Java's String.hashCode does it, so the same word gives the same
// world on every platform and every build - which is the whole point of telling // world on every platform and every build - which is the whole point of telling

2
utilities/uuid.hpp
View File

@@ -14,7 +14,7 @@ public:
static UID random() { static UID random() {
static thread_local std::mt19937_64 gen{clock_seed()}; static thread_local std::mt19937_64 gen{std::random_device{}()};
UID u; UID u;
uint64_t a = gen(); uint64_t a = gen();
uint64_t b = gen(); uint64_t b = gen();