diff options
| author | 2021-11-29 21:10:02 -0600 | |
|---|---|---|
| committer | 2021-11-29 21:10:02 -0600 | |
| commit | 46e3ed5a483eac404ff1e2103ecc4e93e815d45b (patch) | |
| tree | b5317954b6692942ba01b262616a7979141c95fc /src/core/memory | |
| parent | input_common: Fix error with thread name (diff) | |
| parent | input_interpreter: Make use of NpadButton instead of a u64 (diff) | |
| download | yuzu-46e3ed5a483eac404ff1e2103ecc4e93e815d45b.tar.gz yuzu-46e3ed5a483eac404ff1e2103ecc4e93e815d45b.tar.xz yuzu-46e3ed5a483eac404ff1e2103ecc4e93e815d45b.zip | |
Merge pull request #7472 from Morph1984/post-kraken-cleanup
core: hid: Post kraken cleanup
Diffstat (limited to 'src/core/memory')
| -rw-r--r-- | src/core/memory/cheat_engine.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index 20f0e90f5..12446c9ac 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | namespace Core::Memory { | 19 | namespace Core::Memory { |
| 20 | namespace { | 20 | namespace { |
| 21 | constexpr auto CHEAT_ENGINE_NS = std::chrono::nanoseconds{1000000000 / 12}; | 21 | constexpr auto CHEAT_ENGINE_NS = std::chrono::nanoseconds{1000000000 / 12}; |
| 22 | constexpr u32 KEYPAD_BITMASK = 0x3FFFFFF; | ||
| 23 | 22 | ||
| 24 | std::string_view ExtractName(std::string_view data, std::size_t start_index, char match) { | 23 | std::string_view ExtractName(std::string_view data, std::size_t start_index, char match) { |
| 25 | auto end_index = start_index; | 24 | auto end_index = start_index; |
| @@ -61,7 +60,7 @@ u64 StandardVmCallbacks::HidKeysDown() { | |||
| 61 | applet_resource | 60 | applet_resource |
| 62 | ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad) | 61 | ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad) |
| 63 | .GetAndResetPressState(); | 62 | .GetAndResetPressState(); |
| 64 | return press_state & KEYPAD_BITMASK; | 63 | return static_cast<u64>(press_state & HID::NpadButton::All); |
| 65 | } | 64 | } |
| 66 | 65 | ||
| 67 | void StandardVmCallbacks::DebugLog(u8 id, u64 value) { | 66 | void StandardVmCallbacks::DebugLog(u8 id, u64 value) { |