diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-04-10 22:45:40 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-10 22:45:40 -0400 |
| commit | 5d95bb98434b8e7cd67010f6064ccdb69c1222bb (patch) | |
| tree | 5d4c4f1b10d37e2619322a7f837883d61b1d2865 /src/core/system.cpp | |
| parent | d4cb2aab63d4739db6b09a821a9e715985e615be (diff) | |
cleaned up some logging messages
Diffstat (limited to 'src/core/system.cpp')
| -rw-r--r-- | src/core/system.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp index edb07fef57..c77092327b 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -7,6 +7,7 @@ #include "core/mem_map.h" #include "core/system.h" #include "core/hw/hw.h" +#include "core/hle/hle.h" #include "video_core/video_core.h" @@ -19,15 +20,16 @@ void UpdateState(State state) { } void Init(EmuWindow* emu_window) { - Core::Init(); - Memory::Init(); + Core::Init(); + Memory::Init(); HW::Init(); - CoreTiming::Init(); + HLE::Init(); + CoreTiming::Init(); VideoCore::Init(emu_window); } void RunLoopFor(int cycles) { - RunLoopUntil(CoreTiming::GetTicks() + cycles); + RunLoopUntil(CoreTiming::GetTicks() + cycles); } void RunLoopUntil(u64 global_cycles) { @@ -35,9 +37,12 @@ void RunLoopUntil(u64 global_cycles) { void Shutdown() { Core::Shutdown(); + Memory::Shutdown(); HW::Shutdown(); + HLE::Shutdown(); + CoreTiming::Shutdown(); VideoCore::Shutdown(); - g_ctr_file_system.Shutdown(); + g_ctr_file_system.Shutdown(); } } // namespace |