summaryrefslogtreecommitdiff
path: root/src/core/memory
diff options
context:
space:
mode:
authorGravatar Rodrigo Locatti2019-10-17 19:18:52 -0300
committerGravatar GitHub2019-10-17 19:18:52 -0300
commit7398466c33c848ee7b6e8eb7f479c5a2e53b0870 (patch)
tree24102a3157042adfc869e741a8b9f022f5c20d46 /src/core/memory
parentMerge pull request #2980 from lioncash/warn (diff)
parentcore/core: Resolve -Wreorder warnings (diff)
downloadyuzu-7398466c33c848ee7b6e8eb7f479c5a2e53b0870.tar.gz
yuzu-7398466c33c848ee7b6e8eb7f479c5a2e53b0870.tar.xz
yuzu-7398466c33c848ee7b6e8eb7f479c5a2e53b0870.zip
Merge pull request #2990 from lioncash/warn
core: Resolve -Wreorder warnings
Diffstat (limited to 'src/core/memory')
-rw-r--r--src/core/memory/cheat_engine.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp
index b56cb0627..10821d452 100644
--- a/src/core/memory/cheat_engine.cpp
+++ b/src/core/memory/cheat_engine.cpp
@@ -22,7 +22,7 @@ constexpr u32 KEYPAD_BITMASK = 0x3FFFFFF;
22 22
23StandardVmCallbacks::StandardVmCallbacks(const Core::System& system, 23StandardVmCallbacks::StandardVmCallbacks(const Core::System& system,
24 const CheatProcessMetadata& metadata) 24 const CheatProcessMetadata& metadata)
25 : system(system), metadata(metadata) {} 25 : metadata(metadata), system(system) {}
26 26
27StandardVmCallbacks::~StandardVmCallbacks() = default; 27StandardVmCallbacks::~StandardVmCallbacks() = default;
28 28
@@ -176,9 +176,8 @@ std::vector<CheatEntry> TextCheatParser::Parse(const Core::System& system,
176 176
177CheatEngine::CheatEngine(Core::System& system, std::vector<CheatEntry> cheats, 177CheatEngine::CheatEngine(Core::System& system, std::vector<CheatEntry> cheats,
178 const std::array<u8, 0x20>& build_id) 178 const std::array<u8, 0x20>& build_id)
179 : system{system}, core_timing{system.CoreTiming()}, vm{std::make_unique<StandardVmCallbacks>( 179 : vm{std::make_unique<StandardVmCallbacks>(system, metadata)},
180 system, metadata)}, 180 cheats(std::move(cheats)), core_timing{system.CoreTiming()}, system{system} {
181 cheats(std::move(cheats)) {
182 metadata.main_nso_build_id = build_id; 181 metadata.main_nso_build_id = build_id;
183} 182}
184 183