diff options
| author | 2021-06-28 15:58:16 -0400 | |
|---|---|---|
| committer | 2021-06-28 17:32:17 -0400 | |
| commit | b91b76df4fe27d781bd95ddb89b78ff54df57029 (patch) | |
| tree | abd3de5c02b036ec936a70599e496ba1d45d7849 /src/core/loader/nro.cpp | |
| parent | configuration: Defer to common/settings for per-game settings defaults (diff) | |
| download | yuzu-b91b76df4fe27d781bd95ddb89b78ff54df57029.tar.gz yuzu-b91b76df4fe27d781bd95ddb89b78ff54df57029.tar.xz yuzu-b91b76df4fe27d781bd95ddb89b78ff54df57029.zip | |
general: Make most settings a BasicSetting
Creates a new BasicSettings class in common/settings, and forces setting
a default and label for each setting that uses it in common/settings.
Moves defaults and labels from both frontends into common settings.
Creates a helper function in each frontend to facillitate reading the
settings now with the new default and label properties.
Settings::Setting is also now a subclass of Settings::BasicSetting. Also
adds documentation for both Setting and BasicSetting.
Diffstat (limited to 'src/core/loader/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 618555202..951ea966e 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -155,8 +155,8 @@ static bool LoadNroImpl(Kernel::KProcess& process, const std::vector<u8>& data) | |||
| 155 | codeset.segments[i].size = PageAlignSize(nro_header.segments[i].size); | 155 | codeset.segments[i].size = PageAlignSize(nro_header.segments[i].size); |
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | if (!Settings::values.program_args.empty()) { | 158 | if (!Settings::values.program_args.GetValue().empty()) { |
| 159 | const auto arg_data = Settings::values.program_args; | 159 | const auto arg_data = Settings::values.program_args.GetValue(); |
| 160 | codeset.DataSegment().size += NSO_ARGUMENT_DATA_ALLOCATION_SIZE; | 160 | codeset.DataSegment().size += NSO_ARGUMENT_DATA_ALLOCATION_SIZE; |
| 161 | NSOArgumentHeader args_header{ | 161 | NSOArgumentHeader args_header{ |
| 162 | NSO_ARGUMENT_DATA_ALLOCATION_SIZE, static_cast<u32_le>(arg_data.size()), {}}; | 162 | NSO_ARGUMENT_DATA_ALLOCATION_SIZE, static_cast<u32_le>(arg_data.size()), {}}; |