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

Merge branch 'master' into feat/uart-2.0

Browse Source
This commit is contained in:
Hirek
2026-09-19 22:14:43 +02:00
parent 314595e8f0 1d9c608396
commit e50b05394b
15 changed files with 178 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
application/application.cpp
View File

@@ -31,6 +31,7 @@ http://mozilla.org/MPL/2.0/.
#include "utilities/dictionary.h"
#include "version_info.h"
#include <chrono>
#include <format>
#include "utilities/translation.h"
#if WITH_DISCORD_RPC
@@ -320,9 +321,13 @@ int eu07_application::init(int Argc, char *Argv[])
return result;
}
// the run's seed, settled once and kept in Globals: the engines come out of it.
// narrowed on purpose - mt19937 and seed_of() both work on 32 bits, and that is
// the seed somebody can write down and pass on
if (!Global.random_seed)
Global.random_seed = std::random_device{}();
Global.random_seed = static_cast<std::uint32_t>(true_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.
// must run AFTER init_settings (so the ini-loaded value is honoured) and
@@ -1140,10 +1145,21 @@ int eu07_application::init_settings(int Argc, char *Argv[])
Global.local_start_vehicle = ToLower(Argv[++i]);
}
}
else if (token == "-seed")
{
// a number is the seed; anything else is a word that stands for one. said in the
// log as it was given, because that is what gets passed on to somebody else
if (i + 1 < Argc)
{
Global.random_seed = seed_of(Argv[++i]);
WriteLog(std::format("seed given on the command line: {} -> {}", Argv[i], Global.random_seed));
}
}
else
{
std::cout << "usage: " << std::string(Argv[0]) << " [-s sceneryfilepath]"
<< " [-v vehiclename]" << std::endl;
<< " [-v vehiclename]"
<< " [-seed number|word]" << std::endl;
return -1;
}
}
@@ -1421,7 +1437,7 @@ int eu07_application::init_data()
int eu07_application::init_modes()
{
Global.local_random_engine.seed(std::random_device{}());
Global.local_random_engine.seed(static_cast<std::mt19937::result_type>(true_random_seed()));
if ((!Global.network_servers.empty() || Global.network_client) && Global.SceneryFile.empty())
{

3
application/editoruipanels.cpp
View File

@@ -403,10 +403,9 @@ std::string *brush_object_list::GetRandomObject()
if (Objects.empty())
return &empty;
static std::mt19937 rng{std::random_device{}()};
std::uniform_int_distribution<size_t> dist(0, Objects.size() - 1);
return &Objects[dist(rng)];
return &Objects[dist(Global.local_random_engine)];
}
void brush_object_list::render()