diff options
author | bunnei <bunneidev@gmail.com> | 2021-05-04 01:04:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-04 01:04:28 +0200 |
commit | df51eb9bdec5be189e0662ab81bc29277f3da343 (patch) | |
tree | dc1a5cf937fe77ccabb8dab97b5e9a5af9758c27 /src/core/memory | |
parent | Merge pull request #6275 from german77/mousefocus (diff) | |
parent | core: Resolve misc cases of variable shadowing (diff) | |
download | yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.tar yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.tar.gz yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.tar.bz2 yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.tar.lz yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.tar.xz yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.tar.zst yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/memory/cheat_engine.cpp | 4 | ||||
-rw-r--r-- | src/core/memory/cheat_engine.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index 8eec567ab..7643b7846 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp @@ -222,8 +222,8 @@ void CheatEngine::SetMainMemoryParameters(VAddr main_region_begin, u64 main_regi }; } -void CheatEngine::Reload(std::vector<CheatEntry> cheats) { - this->cheats = std::move(cheats); +void CheatEngine::Reload(std::vector<CheatEntry> reload_cheats) { + cheats = std::move(reload_cheats); is_pending_reload.exchange(true); } diff --git a/src/core/memory/cheat_engine.h b/src/core/memory/cheat_engine.h index a31002346..5e6f901ec 100644 --- a/src/core/memory/cheat_engine.h +++ b/src/core/memory/cheat_engine.h @@ -68,7 +68,7 @@ public: void Initialize(); void SetMainMemoryParameters(VAddr main_region_begin, u64 main_region_size); - void Reload(std::vector<CheatEntry> cheats); + void Reload(std::vector<CheatEntry> reload_cheats); private: void FrameCallback(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); |