diff options
Diffstat (limited to 'src/core/memory')
| -rw-r--r-- | src/core/memory/cheat_engine.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index 53a89cc8f..db30ba598 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp | |||
| @@ -10,7 +10,8 @@ | |||
| 10 | #include "core/hle/kernel/k_page_table.h" | 10 | #include "core/hle/kernel/k_page_table.h" |
| 11 | #include "core/hle/kernel/k_process.h" | 11 | #include "core/hle/kernel/k_process.h" |
| 12 | #include "core/hle/service/hid/controllers/npad.h" | 12 | #include "core/hle/service/hid/controllers/npad.h" |
| 13 | #include "core/hle/service/hid/hid.h" | 13 | #include "core/hle/service/hid/hid_server.h" |
| 14 | #include "core/hle/service/hid/resource_manager.h" | ||
| 14 | #include "core/hle/service/sm/sm.h" | 15 | #include "core/hle/service/sm/sm.h" |
| 15 | #include "core/memory.h" | 16 | #include "core/memory.h" |
| 16 | #include "core/memory/cheat_engine.h" | 17 | #include "core/memory/cheat_engine.h" |
| @@ -54,23 +55,20 @@ void StandardVmCallbacks::MemoryWrite(VAddr address, const void* data, u64 size) | |||
| 54 | } | 55 | } |
| 55 | 56 | ||
| 56 | u64 StandardVmCallbacks::HidKeysDown() { | 57 | u64 StandardVmCallbacks::HidKeysDown() { |
| 57 | const auto hid = system.ServiceManager().GetService<Service::HID::Hid>("hid"); | 58 | const auto hid = system.ServiceManager().GetService<Service::HID::IHidServer>("hid"); |
| 58 | if (hid == nullptr) { | 59 | if (hid == nullptr) { |
| 59 | LOG_WARNING(CheatEngine, "Attempted to read input state, but hid is not initialized!"); | 60 | LOG_WARNING(CheatEngine, "Attempted to read input state, but hid is not initialized!"); |
| 60 | return 0; | 61 | return 0; |
| 61 | } | 62 | } |
| 62 | 63 | ||
| 63 | const auto applet_resource = hid->GetAppletResource(); | 64 | const auto applet_resource = hid->GetResourceManager(); |
| 64 | if (applet_resource == nullptr) { | 65 | if (applet_resource == nullptr) { |
| 65 | LOG_WARNING(CheatEngine, | 66 | LOG_WARNING(CheatEngine, |
| 66 | "Attempted to read input state, but applet resource is not initialized!"); | 67 | "Attempted to read input state, but applet resource is not initialized!"); |
| 67 | return 0; | 68 | return 0; |
| 68 | } | 69 | } |
| 69 | 70 | ||
| 70 | const auto press_state = | 71 | const auto press_state = applet_resource->GetNpad()->GetAndResetPressState(); |
| 71 | applet_resource | ||
| 72 | ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad) | ||
| 73 | .GetAndResetPressState(); | ||
| 74 | return static_cast<u64>(press_state & HID::NpadButton::All); | 72 | return static_cast<u64>(press_state & HID::NpadButton::All); |
| 75 | } | 73 | } |
| 76 | 74 | ||