mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Keep same style while window is open, but random at the start

Browse Source
This commit is contained in:
Aaron van Geffen
2024-05-20 20:14:48 +02:00
parent 2f05dc9179
commit a943abdbb3
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/openrct2-ui/windows/ProgressWindow.cpp
View File

@@ -14,6 +14,7 @@
#include <openrct2/drawing/Text.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>
#include <random>
#include <sstream>
namespace OpenRCT2::Ui::Windows
@@ -71,7 +72,7 @@ namespace OpenRCT2::Ui::Windows
std::string _currentCaption;
uint32_t _currentProgress;
uint32_t _totalCount;
uint8_t style;
int8_t style = -1;
public:
void OnOpen() override
@@ -103,8 +104,21 @@ namespace OpenRCT2::Ui::Windows
void ApplyStyle()
{
style = nextStyle++;
nextStyle %= std::size(kVehicleStyles);
if (style >= 0)
{
// Take the next available style, rotating
style = nextStyle++;
nextStyle %= std::size(kVehicleStyles);
}
else
{
// Pick a random style to start off with
std::random_device r;
auto upperBound = static_cast<int8_t>(std::size(kVehicleStyles)) - 1;
std::uniform_int_distribution<int> uniform_dist(0, upperBound);
std::default_random_engine e(r());
style = static_cast<int8_t>(uniform_dist(e));
}
}
void PrepareCaption()
@@ -164,7 +178,6 @@ namespace OpenRCT2::Ui::Windows
_currentProgress = 0;
_totalCount = 0;
ApplyStyle();
Invalidate();
}