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

Set the PSP language in the config file

Browse source
This commit is contained in:
Xele02 2013-01-20 10:50:05 +01:00
parent 3ad4e0f9fd
commit ccdc0b77c1
4 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Core/Config.cpp
View file

@ -18,6 +18,7 @@
#include "Config.h" #include "Config.h"
#include "IniFile.h" #include "IniFile.h"
#include "HLE/sceUtility.h"
SState g_State; SState g_State;
CConfig g_Config; CConfig g_Config;
@ -80,6 +81,9 @@ void CConfig::Load(const char *iniFileName)
false); false);
#endif #endif
IniFile::Section *pspConfig = iniFile.GetOrCreateSection("SystemParam");
pspConfig->Get("Language", &ilanguage, PSP_SYSTEMPARAM_LANGUAGE_ENGLISH);
// Ephemeral settings // Ephemeral settings
bDrawWireframe = false; bDrawWireframe = false;
} }
@ -122,6 +126,9 @@ void CConfig::Save()
control->Set("ShowStick", bShowAnalogStick); control->Set("ShowStick", bShowAnalogStick);
control->Set("ShowTouchControls", bShowTouchControls); control->Set("ShowTouchControls", bShowTouchControls);
IniFile::Section *pspConfig = iniFile.GetOrCreateSection("SystemParam");
pspConfig->Set("Language", ilanguage);
if (!iniFile.Save(iniFilename_.c_str())) { if (!iniFile.Save(iniFilename_.c_str())) {
ERROR_LOG(LOADER, "Error saving config - can't write ini %s", iniFilename_.c_str()); ERROR_LOG(LOADER, "Error saving config - can't write ini %s", iniFilename_.c_str());
return; return;

3
Core/Config.h
View file

@ -68,6 +68,9 @@ public:
bool bShowFPSCounter; bool bShowFPSCounter;
bool bShowDebugStats; bool bShowDebugStats;
// SystemParam
int ilanguage;
std::string currentDirectory; std::string currentDirectory;
std::string memCardDirectory; std::string memCardDirectory;
std::string flashDirectory; std::string flashDirectory;

19
Core/HLE/sceUtility.cpp
View file

@ -273,23 +273,6 @@ int sceUtilityGamedataInstallGetStatus()
#define PSP_SYSTEMPARAM_BUTTON_CIRCLE 0 #define PSP_SYSTEMPARAM_BUTTON_CIRCLE 0
#define PSP_SYSTEMPARAM_BUTTON_CROSS 1 #define PSP_SYSTEMPARAM_BUTTON_CROSS 1
/**
* Valid values for PSP_SYSTEMPARAM_ID_INT_LANGUAGE
*/
#define PSP_SYSTEMPARAM_LANGUAGE_JAPANESE 0
#define PSP_SYSTEMPARAM_LANGUAGE_ENGLISH 1
#define PSP_SYSTEMPARAM_LANGUAGE_FRENCH 2
#define PSP_SYSTEMPARAM_LANGUAGE_SPANISH 3
#define PSP_SYSTEMPARAM_LANGUAGE_GERMAN 4
#define PSP_SYSTEMPARAM_LANGUAGE_ITALIAN 5
#define PSP_SYSTEMPARAM_LANGUAGE_DUTCH 6
#define PSP_SYSTEMPARAM_LANGUAGE_PORTUGUESE 7
#define PSP_SYSTEMPARAM_LANGUAGE_RUSSIAN 8
#define PSP_SYSTEMPARAM_LANGUAGE_KOREAN 9
#define PSP_SYSTEMPARAM_LANGUAGE_CHINESE_TRADITIONAL 10
#define PSP_SYSTEMPARAM_LANGUAGE_CHINESE_SIMPLIFIED 11
//TODO: should save to config file //TODO: should save to config file
u32 sceUtilitySetSystemParamString(u32 id, u32 strPtr) u32 sceUtilitySetSystemParamString(u32 id, u32 strPtr)
{ {
@ -339,7 +322,7 @@ u32 sceUtilityGetSystemParamInt(u32 id, u32 destaddr)
param = PSP_SYSTEMPARAM_TIME_FORMAT_24HR; param = PSP_SYSTEMPARAM_TIME_FORMAT_24HR;
break; break;
case PSP_SYSTEMPARAM_ID_INT_LANGUAGE: case PSP_SYSTEMPARAM_ID_INT_LANGUAGE:
param = PSP_SYSTEMPARAM_LANGUAGE_ENGLISH; param = g_Config.ilanguage;
break; break;
case PSP_SYSTEMPARAM_ID_INT_BUTTON_PREFERENCE: case PSP_SYSTEMPARAM_ID_INT_BUTTON_PREFERENCE:
param = PSP_SYSTEMPARAM_BUTTON_CROSS; param = PSP_SYSTEMPARAM_BUTTON_CROSS;

19
Core/HLE/sceUtility.h
View file

@ -17,6 +17,25 @@
#pragma once #pragma once
#include "../../Common/ChunkFile.h"
/**
* Valid values for PSP_SYSTEMPARAM_ID_INT_LANGUAGE
*/
#define PSP_SYSTEMPARAM_LANGUAGE_JAPANESE 0
#define PSP_SYSTEMPARAM_LANGUAGE_ENGLISH 1
#define PSP_SYSTEMPARAM_LANGUAGE_FRENCH 2
#define PSP_SYSTEMPARAM_LANGUAGE_SPANISH 3
#define PSP_SYSTEMPARAM_LANGUAGE_GERMAN 4
#define PSP_SYSTEMPARAM_LANGUAGE_ITALIAN 5
#define PSP_SYSTEMPARAM_LANGUAGE_DUTCH 6
#define PSP_SYSTEMPARAM_LANGUAGE_PORTUGUESE 7
#define PSP_SYSTEMPARAM_LANGUAGE_RUSSIAN 8
#define PSP_SYSTEMPARAM_LANGUAGE_KOREAN 9
#define PSP_SYSTEMPARAM_LANGUAGE_CHINESE_TRADITIONAL 10
#define PSP_SYSTEMPARAM_LANGUAGE_CHINESE_SIMPLIFIED 11
void __UtilityInit(); void __UtilityInit();
void __UtilityDoState(PointerWrap &p); void __UtilityDoState(PointerWrap &p);
void __UtilityShutdown(); void __UtilityShutdown();