diff options
| author | 2023-12-23 13:58:09 -0500 | |
|---|---|---|
| committer | 2023-12-23 15:36:44 -0500 | |
| commit | f34d3d7e84a1396d4d4f07ec1434b06b1f39bb8a (patch) | |
| tree | e04a08b7ecf57be7aa7a9d2801f09eddd5d19018 /src/core/memory | |
| parent | Merge pull request #12412 from ameerj/gl-query-prims (diff) | |
| download | yuzu-f34d3d7e84a1396d4d4f07ec1434b06b1f39bb8a.tar.gz yuzu-f34d3d7e84a1396d4d4f07ec1434b06b1f39bb8a.tar.xz yuzu-f34d3d7e84a1396d4d4f07ec1434b06b1f39bb8a.zip | |
core_timing: remove user data value
Diffstat (limited to 'src/core/memory')
| -rw-r--r-- | src/core/memory/cheat_engine.cpp | 8 | ||||
| -rw-r--r-- | src/core/memory/cheat_engine.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index 3fc4024dc..7bc5b5ae5 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp | |||
| @@ -190,15 +190,15 @@ CheatEngine::CheatEngine(System& system_, std::vector<CheatEntry> cheats_, | |||
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | CheatEngine::~CheatEngine() { | 192 | CheatEngine::~CheatEngine() { |
| 193 | core_timing.UnscheduleEvent(event, 0); | 193 | core_timing.UnscheduleEvent(event); |
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | void CheatEngine::Initialize() { | 196 | void CheatEngine::Initialize() { |
| 197 | event = Core::Timing::CreateEvent( | 197 | event = Core::Timing::CreateEvent( |
| 198 | "CheatEngine::FrameCallback::" + Common::HexToString(metadata.main_nso_build_id), | 198 | "CheatEngine::FrameCallback::" + Common::HexToString(metadata.main_nso_build_id), |
| 199 | [this](std::uintptr_t user_data, s64 time, | 199 | [this](s64 time, |
| 200 | std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> { | 200 | std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> { |
| 201 | FrameCallback(user_data, ns_late); | 201 | FrameCallback(ns_late); |
| 202 | return std::nullopt; | 202 | return std::nullopt; |
| 203 | }); | 203 | }); |
| 204 | core_timing.ScheduleLoopingEvent(CHEAT_ENGINE_NS, CHEAT_ENGINE_NS, event); | 204 | core_timing.ScheduleLoopingEvent(CHEAT_ENGINE_NS, CHEAT_ENGINE_NS, event); |
| @@ -239,7 +239,7 @@ void CheatEngine::Reload(std::vector<CheatEntry> reload_cheats) { | |||
| 239 | 239 | ||
| 240 | MICROPROFILE_DEFINE(Cheat_Engine, "Add-Ons", "Cheat Engine", MP_RGB(70, 200, 70)); | 240 | MICROPROFILE_DEFINE(Cheat_Engine, "Add-Ons", "Cheat Engine", MP_RGB(70, 200, 70)); |
| 241 | 241 | ||
| 242 | void CheatEngine::FrameCallback(std::uintptr_t, std::chrono::nanoseconds ns_late) { | 242 | void CheatEngine::FrameCallback(std::chrono::nanoseconds ns_late) { |
| 243 | if (is_pending_reload.exchange(false)) { | 243 | if (is_pending_reload.exchange(false)) { |
| 244 | vm.LoadProgram(cheats); | 244 | vm.LoadProgram(cheats); |
| 245 | } | 245 | } |
diff --git a/src/core/memory/cheat_engine.h b/src/core/memory/cheat_engine.h index 284abdd28..ced2168d1 100644 --- a/src/core/memory/cheat_engine.h +++ b/src/core/memory/cheat_engine.h | |||
| @@ -70,7 +70,7 @@ public: | |||
| 70 | void Reload(std::vector<CheatEntry> reload_cheats); | 70 | void Reload(std::vector<CheatEntry> reload_cheats); |
| 71 | 71 | ||
| 72 | private: | 72 | private: |
| 73 | void FrameCallback(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); | 73 | void FrameCallback(std::chrono::nanoseconds ns_late); |
| 74 | 74 | ||
| 75 | DmntCheatVm vm; | 75 | DmntCheatVm vm; |
| 76 | CheatProcessMetadata metadata; | 76 | CheatProcessMetadata metadata; |