diff options
| -rw-r--r-- | src/core/core.cpp | 4 | ||||
| -rw-r--r-- | src/core/memory/cheat_engine.cpp | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index ddc767e30..a30253c50 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -112,8 +112,8 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, | |||
| 112 | } | 112 | } |
| 113 | struct System::Impl { | 113 | struct System::Impl { |
| 114 | explicit Impl(System& system) | 114 | explicit Impl(System& system) |
| 115 | : kernel{system}, fs_controller{system}, cpu_core_manager{system}, | 115 | : kernel{system}, fs_controller{system}, cpu_core_manager{system}, reporter{system}, |
| 116 | applet_manager{system}, reporter{system} {} | 116 | applet_manager{system} {} |
| 117 | 117 | ||
| 118 | Cpu& CurrentCpuCore() { | 118 | Cpu& CurrentCpuCore() { |
| 119 | return cpu_core_manager.GetCurrentCore(); | 119 | return cpu_core_manager.GetCurrentCore(); |
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 | ||
| 23 | StandardVmCallbacks::StandardVmCallbacks(const Core::System& system, | 23 | StandardVmCallbacks::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 | ||
| 27 | StandardVmCallbacks::~StandardVmCallbacks() = default; | 27 | StandardVmCallbacks::~StandardVmCallbacks() = default; |
| 28 | 28 | ||
| @@ -176,9 +176,8 @@ std::vector<CheatEntry> TextCheatParser::Parse(const Core::System& system, | |||
| 176 | 176 | ||
| 177 | CheatEngine::CheatEngine(Core::System& system, std::vector<CheatEntry> cheats, | 177 | CheatEngine::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 | ||