thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'cwcheat' of https://github.com/makotech222/ppsspp into makotech222-cwcheat

Browse source 
Conflicts:
	Core/Config.cpp
	Core/Config.h
	Core/Core.vcxproj.filters
	Core/HLE/sceKernel.cpp
This commit is contained in:
Henrik Rydgard 2013-05-22 21:04:12 +02:00
commit 08e0881c94
11 changed files with 584 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Core/HLE/sceKernel.cpp
View file

@ -16,6 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Core/Config.h"
#include "Core/Cwcheat.h"
#include "Core/HLE/HLE.h"
#include "Core/MIPS/MIPS.h"
#include "Core/MIPS/MIPSCodeUtils.h"
@ -119,6 +120,7 @@ void __KernelInit()
__FontInit();
__NetInit();
__VaudioInit();
__CheatInit();
SaveState::Init(); // Must be after IO, as it may create a directory
@ -160,6 +162,7 @@ void __KernelShutdown()
__KernelThreadingShutdown();
__KernelMemoryShutdown();
__InterruptsShutdown();
__CheatShutdown();
CoreTiming::ClearPendingEvents();
CoreTiming::UnregisterAllEvents();