diff options
| author | 2021-05-16 01:17:18 -0400 | |
|---|---|---|
| committer | 2021-05-17 15:54:30 -0400 | |
| commit | 339dc4f806b0c39a4ec6460187f345c4e2890d05 (patch) | |
| tree | 1e47f2c0afa0a9bc4ecae5f2d9886c71bc6629c4 /src/common | |
| parent | configuration: Add CPU tab to game properties (diff) | |
| download | yuzu-339dc4f806b0c39a4ec6460187f345c4e2890d05.tar.gz yuzu-339dc4f806b0c39a4ec6460187f345c4e2890d05.tar.xz yuzu-339dc4f806b0c39a4ec6460187f345c4e2890d05.zip | |
general: Demote custom_rtc to regular setting
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/settings.cpp | 1 | ||||
| -rw-r--r-- | src/common/settings.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 7c8fced59..e29cbf506 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp | |||
| @@ -136,7 +136,6 @@ void RestoreGlobalState(bool is_powered_on) { | |||
| 136 | values.region_index.SetGlobal(true); | 136 | values.region_index.SetGlobal(true); |
| 137 | values.time_zone_index.SetGlobal(true); | 137 | values.time_zone_index.SetGlobal(true); |
| 138 | values.rng_seed.SetGlobal(true); | 138 | values.rng_seed.SetGlobal(true); |
| 139 | values.custom_rtc.SetGlobal(true); | ||
| 140 | values.sound_index.SetGlobal(true); | 139 | values.sound_index.SetGlobal(true); |
| 141 | 140 | ||
| 142 | // Controls | 141 | // Controls |
diff --git a/src/common/settings.h b/src/common/settings.h index 68dc2ea7d..48085b9a9 100644 --- a/src/common/settings.h +++ b/src/common/settings.h | |||
| @@ -157,7 +157,7 @@ struct Values { | |||
| 157 | // System | 157 | // System |
| 158 | Setting<std::optional<u32>> rng_seed; | 158 | Setting<std::optional<u32>> rng_seed; |
| 159 | // Measured in seconds since epoch | 159 | // Measured in seconds since epoch |
| 160 | Setting<std::optional<std::chrono::seconds>> custom_rtc; | 160 | std::optional<std::chrono::seconds> custom_rtc; |
| 161 | // Set on game boot, reset on stop. Seconds difference between current time and `custom_rtc` | 161 | // Set on game boot, reset on stop. Seconds difference between current time and `custom_rtc` |
| 162 | std::chrono::seconds custom_rtc_differential; | 162 | std::chrono::seconds custom_rtc_differential; |
| 163 | 163 | ||