diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-10-14 15:58:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-14 15:58:03 +0200 |
| commit | 18672e6a78c4df3bdd7e1728c484beb88cdc7a22 (patch) | |
| tree | 3aac6f5410aab34818a55142d74f03ed17470e2d /src/common | |
| parent | Merge pull request #11772 from v1993/polyfill-thread-fixes (diff) | |
| parent | fix style (diff) | |
| download | yuzu-18672e6a78c4df3bdd7e1728c484beb88cdc7a22.tar yuzu-18672e6a78c4df3bdd7e1728c484beb88cdc7a22.tar.gz yuzu-18672e6a78c4df3bdd7e1728c484beb88cdc7a22.tar.bz2 yuzu-18672e6a78c4df3bdd7e1728c484beb88cdc7a22.tar.lz yuzu-18672e6a78c4df3bdd7e1728c484beb88cdc7a22.tar.xz yuzu-18672e6a78c4df3bdd7e1728c484beb88cdc7a22.tar.zst yuzu-18672e6a78c4df3bdd7e1728c484beb88cdc7a22.zip | |
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/settings.cpp | 5 | ||||
| -rw-r--r-- | src/common/settings.h | 5 | ||||
| -rw-r--r-- | src/common/settings_enums.h | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 3fde3cae6..98b43e49c 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -45,6 +45,7 @@ SWITCHABLE(CpuAccuracy, true); SWITCHABLE(FullscreenMode, true); SWITCHABLE(GpuAccuracy, true); SWITCHABLE(Language, true); +SWITCHABLE(MemoryLayout, true); SWITCHABLE(NvdecEmulation, false); SWITCHABLE(Region, true); SWITCHABLE(RendererBackend, true); @@ -61,6 +62,10 @@ SWITCHABLE(u32, false); SWITCHABLE(u8, false); SWITCHABLE(u8, true); +// Used in UISettings +// TODO see if we can move this to uisettings.cpp +SWITCHABLE(ConfirmStop, true); + #undef SETTING #undef SWITCHABLE #endif diff --git a/src/common/settings.h b/src/common/settings.h index 98ab0ec2e..236e33bee 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -67,6 +67,7 @@ SWITCHABLE(CpuAccuracy, true); SWITCHABLE(FullscreenMode, true); SWITCHABLE(GpuAccuracy, true); SWITCHABLE(Language, true); +SWITCHABLE(MemoryLayout, true); SWITCHABLE(NvdecEmulation, false); SWITCHABLE(Region, true); SWITCHABLE(RendererBackend, true); @@ -83,6 +84,10 @@ SWITCHABLE(u32, false); SWITCHABLE(u8, false); SWITCHABLE(u8, true); +// Used in UISettings +// TODO see if we can move this to uisettings.h +SWITCHABLE(ConfirmStop, true); + #undef SETTING #undef SWITCHABLE #endif diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h index 815cafe15..11429d7a8 100644 --- a/src/common/settings_enums.h +++ b/src/common/settings_enums.h @@ -133,6 +133,8 @@ ENUM(CpuAccuracy, Auto, Accurate, Unsafe, Paranoid); ENUM(MemoryLayout, Memory_4Gb, Memory_6Gb, Memory_8Gb); +ENUM(ConfirmStop, Ask_Always, Ask_Based_On_Game, Ask_Never); + ENUM(FullscreenMode, Borderless, Exclusive); ENUM(NvdecEmulation, Off, Cpu, Gpu); |