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

Conflicts:
	Core/Config.cpp
	Core/Config.h
	Core/Core.vcxproj.filters
	Core/HLE/sceKernel.cpp
This commit is contained in:
Henrik Rydgard committed 2013-05-22 21:04:12 +02:00
commit 08e0881c94
11 files changed
+584 -3

No files matched your search

+2
View File
@@ -63,6 +63,7 @@ void Config::Load(const char *iniFileName)
general->Get("ShowDebuggerOnLoad", &bShowDebuggerOnLoad, false);
general->Get("Language", &languageIni, "en_US");
general->Get("NumWorkerThreads", &iNumWorkerThreads, cpu_info.num_cores);
general->Get("EnableCheats", &iEnableCheats, 0);
general->Get("MaxRecent", &iMaxRecent, 12);
// Fix issue from switching from uint (hex in .ini) to int (dec)
if (iMaxRecent == 0)
@@ -183,6 +184,7 @@ void Config::Save()
general->Set("Language", languageIni);
general->Set("NumWorkerThreads", iNumWorkerThreads);
general->Set("MaxRecent", iMaxRecent);
general->Set("EnableCheats", iEnableCheats);
IniFile::Section *cpu = iniFile.GetOrCreateSection("CPU");
cpu->Set("Jit", bJit);