diff options
author | MonsterDruide1 <5958456@gmail.com> | 2021-06-18 16:32:46 +0200 |
---|---|---|
committer | MonsterDruide1 <5958456@gmail.com> | 2021-09-18 23:22:20 +0200 |
commit | 4297d2fea2228ff4afe2a7c244fb8b3f1a97491a (patch) | |
tree | 25a1ce3a2d41bf9e066c7a57a441be65e282f16f /src/common | |
parent | main: TAS Playback state label (diff) | |
download | yuzu-4297d2fea2228ff4afe2a7c244fb8b3f1a97491a.tar yuzu-4297d2fea2228ff4afe2a7c244fb8b3f1a97491a.tar.gz yuzu-4297d2fea2228ff4afe2a7c244fb8b3f1a97491a.tar.bz2 yuzu-4297d2fea2228ff4afe2a7c244fb8b3f1a97491a.tar.lz yuzu-4297d2fea2228ff4afe2a7c244fb8b3f1a97491a.tar.xz yuzu-4297d2fea2228ff4afe2a7c244fb8b3f1a97491a.tar.zst yuzu-4297d2fea2228ff4afe2a7c244fb8b3f1a97491a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/fs/fs_paths.h | 1 | ||||
-rw-r--r-- | src/common/fs/path_util.cpp | 3 | ||||
-rw-r--r-- | src/common/settings.h | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/common/fs/fs_paths.h b/src/common/fs/fs_paths.h index b32614797..84968b8e0 100644 --- a/src/common/fs/fs_paths.h +++ b/src/common/fs/fs_paths.h @@ -21,6 +21,7 @@ #define SCREENSHOTS_DIR "screenshots" #define SDMC_DIR "sdmc" #define SHADER_DIR "shader" +#define TAS_DIR "scripts" // yuzu-specific files diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp index 5f76adedb..97d026eb8 100644 --- a/src/common/fs/path_util.cpp +++ b/src/common/fs/path_util.cpp @@ -116,8 +116,7 @@ private: GenerateYuzuPath(YuzuPath::ScreenshotsDir, yuzu_path / SCREENSHOTS_DIR); GenerateYuzuPath(YuzuPath::SDMCDir, yuzu_path / SDMC_DIR); GenerateYuzuPath(YuzuPath::ShaderDir, yuzu_path / SHADER_DIR); - - GenerateYuzuPath(YuzuPath::TASFile, fs::path{""}); + GenerateYuzuPath(YuzuPath::TASFile, yuzu_path / TAS_DIR); } ~PathManagerImpl() = default; diff --git a/src/common/settings.h b/src/common/settings.h index 884ea55f8..7333a64dc 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -500,7 +500,6 @@ struct Values { // Controls InputSetting<std::array<PlayerInput, 10>> players; - std::shared_ptr<InputCommon::InputSubsystem> inputSubsystem = NULL; Setting<bool> use_docked_mode{true, "use_docked_mode"}; @@ -514,9 +513,12 @@ struct Values { "motion_device"}; BasicSetting<std::string> udp_input_servers{"127.0.0.1:26760", "udp_input_servers"}; - BasicSetting<bool> tas_enable{false, "tas_enable"}; + BasicSetting<bool> pause_tas_on_load { false, "pause_tas_on_load" }; + BasicSetting<bool> tas_enable{ false, "tas_enable" }; BasicSetting<bool> tas_reset{ false, "tas_reset" }; BasicSetting<bool> tas_record{ false, "tas_record" }; + BasicSetting<bool> is_cpu_boxted{ false, " BasicSetting<bool> is_cpu_boxted{ false, "cpuBoosted" }; +" }; BasicSetting<bool> mouse_panning{false, "mouse_panning"}; BasicRangedSetting<u8> mouse_panning_sensitivity{10, 1, 100, "mouse_panning_sensitivity"}; @@ -550,9 +552,6 @@ struct Values { BasicSetting<bool> gamecard_current_game{false, "gamecard_current_game"}; BasicSetting<std::string> gamecard_path{std::string(), "gamecard_path"}; - // TAS - bool pauseTasOnLoad; - // Debugging bool record_frame_times; BasicSetting<bool> use_gdbstub{false, "use_gdbstub"}; |