real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Removes rand function usage from Atlas and unused rand include from particles.

Browse Source 
This was SVN commit r26153.
This commit is contained in:
Vladislav Belov 2022-01-02 22:35:17 +00:00
parent e547704a54
commit e9070a2630
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/graphics/ParticleEmitterType.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2019 Wildfire Games.
/* Copyright (C) 2022 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -23,7 +23,6 @@
#include "graphics/ParticleEmitter.h"
#include "graphics/ParticleManager.h"
#include "graphics/TextureManager.h"
#include "lib/rand.h"
#include "maths/MathUtil.h"
#include "ps/CLogger.h"
#include "ps/Filesystem.h"

9
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2022 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -27,6 +27,8 @@
#include "ScenarioEditor/Tools/Common/Tools.h"
#include <algorithm>
#include <ctime>
#include <random>
#include <wx/busyinfo.h>
#include <wx/filename.h>
@ -669,9 +671,12 @@ void MapSidebar::OnSimReset(wxCommandEvent& WXUNUSED(event))
void MapSidebar::OnRandomReseed(wxCommandEvent& WXUNUSED(evt))
{
std::mt19937 engine(std::time(nullptr));
std::uniform_int_distribution<int> distribution(0, 10000);
// Pick a shortish randomish value
wxString seed;
seed << (int)floor((rand() / (float)RAND_MAX) * 10000.f);
seed << distribution(engine);
wxDynamicCast(FindWindow(ID_RandomSeed), wxTextCtrl)->SetValue(seed);
}

9
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2019 Wildfire Games.
/* Copyright (C) 2022 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -24,6 +24,9 @@
#include "Common/ObjectSettings.h"
#include "GameInterface/Messages.h"
#include <ctime>
#include <random>
using AtlasMessage::Position;
static float g_DefaultAngle = (float)(M_PI*3.0/4.0);
@ -145,7 +148,9 @@ public:
void RandomizeActorSeed()
{
m_ActorSeed = (unsigned int)floor((rand() / (float)RAND_MAX) * 65535.f);
std::mt19937 engine(std::time(nullptr));
std::uniform_int_distribution<unsigned int> distribution(0, 65535);
m_ActorSeed = distribution(engine);
}
struct sWaiting : public State