diff options
author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2019-10-17 19:18:52 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-17 19:18:52 -0300 |
commit | 7398466c33c848ee7b6e8eb7f479c5a2e53b0870 (patch) | |
tree | 24102a3157042adfc869e741a8b9f022f5c20d46 /src/core/memory | |
parent | 9fe8072c67f0a99c68b95c69ea19c2334fd0258f (diff) | |
parent | 98c6a9507982de0f6577bb18429f07facb0e465f (diff) |
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.cpp | 7 |
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; StandardVmCallbacks::StandardVmCallbacks(const Core::System& system, const CheatProcessMetadata& metadata) - : system(system), metadata(metadata) {} + : metadata(metadata), system(system) {} StandardVmCallbacks::~StandardVmCallbacks() = default; @@ -176,9 +176,8 @@ std::vector<CheatEntry> TextCheatParser::Parse(const Core::System& system, CheatEngine::CheatEngine(Core::System& system, std::vector<CheatEntry> cheats, const std::array<u8, 0x20>& build_id) - : system{system}, core_timing{system.CoreTiming()}, vm{std::make_unique<StandardVmCallbacks>( - system, metadata)}, - cheats(std::move(cheats)) { + : vm{std::make_unique<StandardVmCallbacks>(system, metadata)}, + cheats(std::move(cheats)), core_timing{system.CoreTiming()}, system{system} { metadata.main_nso_build_id = build_id; } |