summaryrefslogtreecommitdiffstats
path: root/src/core/memory
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-07-28 04:29:22 +0200
committerGitHub <noreply@github.com>2020-07-28 04:29:22 +0200
commit05781ce8c4dd4d4150185effac56ef9a71ae2705 (patch)
tree12d41a29b43577b95b158bc033aadc3957bde3d7 /src/core/memory
parentMerge pull request #4420 from lat9nq/fix-themed-label-bg (diff)
parentcore_timing: Make use of uintptr_t to represent user_data (diff)
downloadyuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.gz
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.bz2
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.lz
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.xz
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.zst
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.zip
Diffstat (limited to 'src/core/memory')
-rw-r--r--src/core/memory/cheat_engine.cpp12
-rw-r--r--src/core/memory/cheat_engine.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp
index ced41b1fe..eeebdf02e 100644
--- a/src/core/memory/cheat_engine.cpp
+++ b/src/core/memory/cheat_engine.cpp
@@ -188,11 +188,11 @@ CheatEngine::~CheatEngine() {
}
void CheatEngine::Initialize() {
- event = Core::Timing::CreateEvent("CheatEngine::FrameCallback::" +
- Common::HexToString(metadata.main_nso_build_id),
- [this](u64 userdata, std::chrono::nanoseconds ns_late) {
- FrameCallback(userdata, ns_late);
- });
+ event = Core::Timing::CreateEvent(
+ "CheatEngine::FrameCallback::" + Common::HexToString(metadata.main_nso_build_id),
+ [this](std::uintptr_t user_data, std::chrono::nanoseconds ns_late) {
+ FrameCallback(user_data, ns_late);
+ });
core_timing.ScheduleEvent(CHEAT_ENGINE_NS, event);
metadata.process_id = system.CurrentProcess()->GetProcessID();
@@ -219,7 +219,7 @@ void CheatEngine::Reload(std::vector<CheatEntry> cheats) {
MICROPROFILE_DEFINE(Cheat_Engine, "Add-Ons", "Cheat Engine", MP_RGB(70, 200, 70));
-void CheatEngine::FrameCallback(u64, std::chrono::nanoseconds ns_late) {
+void CheatEngine::FrameCallback(std::uintptr_t, std::chrono::nanoseconds ns_late) {
if (is_pending_reload.exchange(false)) {
vm.LoadProgram(cheats);
}
diff --git a/src/core/memory/cheat_engine.h b/src/core/memory/cheat_engine.h
index d4068cf84..fa039a831 100644
--- a/src/core/memory/cheat_engine.h
+++ b/src/core/memory/cheat_engine.h
@@ -72,7 +72,7 @@ public:
void Reload(std::vector<CheatEntry> cheats);
private:
- void FrameCallback(u64 userdata, std::chrono::nanoseconds ns_late);
+ void FrameCallback(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
DmntCheatVm vm;
CheatProcessMetadata metadata;