Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

settings,core,config_sys: Remove optional type from custom_rtc, rng_seed

Browse source 
core: Fix MSVC errors
This commit is contained in:
lat9nq 2023-06-05 20:41:50 -04:00
parent 5ccfaf0517
commit 4133165607
6 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/common/settings.cpp
View file

@ -62,7 +62,8 @@ void LogSettings() {
LOG_INFO(Config, "yuzu Configuration:");
log_setting("Controls_UseDockedMode", values.use_docked_mode.GetValue());
log_setting("System_RngSeed", values.rng_seed.GetValue().value_or(0));
log_setting("System_RngSeedEnabled", values.rng_seed_enabled.GetValue());
log_setting("System_RngSeed", values.rng_seed.GetValue());
log_setting("System_DeviceName", values.device_name.GetValue());
log_setting("System_CurrentUser", values.current_user.GetValue());
log_setting("System_LanguageIndex", values.language_index.GetValue());

6
src/common/settings.h
View file

@ -505,10 +505,12 @@ struct Values {
SwitchableSetting<u8> bg_blue{0, "bg_blue"};
// System
SwitchableSetting<std::optional<u32>> rng_seed{std::optional<u32>(), "rng_seed"};
SwitchableSetting<bool> rng_seed_enabled{false, "rng_seed_enabled"};
SwitchableSetting<u32> rng_seed{0, "rng_seed"};
Setting<std::string> device_name{"Yuzu", "device_name"};
// Measured in seconds since epoch
std::optional<s64> custom_rtc;
SwitchableSetting<bool> custom_rtc_enabled{false, "custom_rtc_enabled"};
SwitchableSetting<s64> custom_rtc{0, "custom_rtc"};
// Set on game boot, reset on stop. Seconds difference between current time and `custom_rtc`
s64 custom_rtc_differential;