summaryrefslogtreecommitdiff
path: root/src/common/settings.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/settings.h')
-rw-r--r--src/common/settings.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/common/settings.h b/src/common/settings.h
index b1bddb895..29b888f10 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -14,6 +14,7 @@
14#include <utility> 14#include <utility>
15#include <vector> 15#include <vector>
16 16
17#include <input_common/main.h>
17#include "common/common_types.h" 18#include "common/common_types.h"
18#include "common/settings_input.h" 19#include "common/settings_input.h"
19 20
@@ -499,6 +500,7 @@ struct Values {
499 500
500 // Controls 501 // Controls
501 InputSetting<std::array<PlayerInput, 10>> players; 502 InputSetting<std::array<PlayerInput, 10>> players;
503 std::shared_ptr<InputCommon::InputSubsystem> inputSubsystem = NULL;
502 504
503 Setting<bool> use_docked_mode{true, "use_docked_mode"}; 505 Setting<bool> use_docked_mode{true, "use_docked_mode"};
504 506
@@ -512,9 +514,14 @@ struct Values {
512 "motion_device"}; 514 "motion_device"};
513 BasicSetting<std::string> udp_input_servers{"127.0.0.1:26760", "udp_input_servers"}; 515 BasicSetting<std::string> udp_input_servers{"127.0.0.1:26760", "udp_input_servers"};
514 516
517 BasicSetting<bool> tas_enable{false, "tas_enable"};
518 BasicSetting<bool> tas_reset{ false, "tas_reset" };
519 BasicSetting<bool> tas_record{ false, "tas_record" };
520
515 BasicSetting<bool> mouse_panning{false, "mouse_panning"}; 521 BasicSetting<bool> mouse_panning{false, "mouse_panning"};
516 BasicRangedSetting<u8> mouse_panning_sensitivity{10, 1, 100, "mouse_panning_sensitivity"}; 522 BasicRangedSetting<u8> mouse_panning_sensitivity{10, 1, 100, "mouse_panning_sensitivity"};
517 BasicSetting<bool> mouse_enabled{false, "mouse_enabled"}; 523 BasicSetting<bool> mouse_enabled{false, "mouse_enabled"};
524
518 std::string mouse_device; 525 std::string mouse_device;
519 MouseButtonsRaw mouse_buttons; 526 MouseButtonsRaw mouse_buttons;
520 527