diff options
author | german77 <juangerman-13@hotmail.com> | 2021-11-04 19:08:54 +0100 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2021-11-25 03:30:27 +0100 |
commit | 5d0f3540c4b085103afa27d6120ea29e0324a5a2 (patch) | |
tree | 9cdfe756391969476385d3f391d74a6e75aa5889 /src/core/hid/emulated_controller.h | |
parent | config: Cleanup and documentation (diff) | |
download | yuzu-5d0f3540c4b085103afa27d6120ea29e0324a5a2.tar yuzu-5d0f3540c4b085103afa27d6120ea29e0324a5a2.tar.gz yuzu-5d0f3540c4b085103afa27d6120ea29e0324a5a2.tar.bz2 yuzu-5d0f3540c4b085103afa27d6120ea29e0324a5a2.tar.lz yuzu-5d0f3540c4b085103afa27d6120ea29e0324a5a2.tar.xz yuzu-5d0f3540c4b085103afa27d6120ea29e0324a5a2.tar.zst yuzu-5d0f3540c4b085103afa27d6120ea29e0324a5a2.zip |
Diffstat (limited to 'src/core/hid/emulated_controller.h')
-rw-r--r-- | src/core/hid/emulated_controller.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index 9a8bdf14d..fa2e89c0b 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h @@ -142,23 +142,23 @@ public: YUZU_NON_MOVEABLE(EmulatedController); /// Converts the controller type from settings to npad type - static NpadType MapSettingsTypeToNPad(Settings::ControllerType type); + static NpadStyleIndex MapSettingsTypeToNPad(Settings::ControllerType type); /// Converts npad type to the equivalent of controller type from settings - static Settings::ControllerType MapNPadToSettingsType(NpadType type); + static Settings::ControllerType MapNPadToSettingsType(NpadStyleIndex type); /// Gets the NpadIdType for this controller NpadIdType GetNpadIdType() const; - /// Sets the NpadType for this controller - void SetNpadType(NpadType npad_type_); + /// Sets the NpadStyleIndex for this controller + void SetNpadStyleIndex(NpadStyleIndex npad_type_); /** - * Gets the NpadType for this controller + * Gets the NpadStyleIndex for this controller * @param If true tmp_npad_type will be returned - * @return NpadType set on the controller + * @return NpadStyleIndex set on the controller */ - NpadType GetNpadType(bool get_temporary_value = false) const; + NpadStyleIndex GetNpadStyleIndex(bool get_temporary_value = false) const; /// Sets the connected status to true void Connect(); @@ -351,14 +351,14 @@ private: void TriggerOnChange(ControllerTriggerType type, bool is_service_update); NpadIdType npad_id_type; - NpadType npad_type{NpadType::None}; + NpadStyleIndex npad_type{NpadStyleIndex::None}; bool is_connected{false}; bool is_configuring{false}; f32 motion_sensitivity{0.01f}; bool force_update_motion{false}; // Temporary values to avoid doing changes while the controller is on configuration mode - NpadType tmp_npad_type{NpadType::None}; + NpadStyleIndex tmp_npad_type{NpadStyleIndex::None}; bool tmp_is_connected{false}; ButtonParams button_params; |