ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zerospu2: fix an issue with gcc 4-6 (note some gcc 4.6 optimization breaks pcsx2...) 

i18n: allow to translate a part of system default for the language selection.

Rational: In case system default is incorrect, we will still get an english part (with the unknow-language translation)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4603 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2011-04-29 21:02:31 +00:00
parent db2f16b985
commit 033ecabcf2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/gui/i18n.cpp
View File

@ -60,6 +60,7 @@ LangPackEnumeration::LangPackEnumeration()
{ {
wxLangId = wxLANGUAGE_DEFAULT; wxLangId = wxLANGUAGE_DEFAULT;
englishName = L" System Default"; // left-side space forces it to sort to the front of the lists englishName = L" System Default"; // left-side space forces it to sort to the front of the lists
englishName += _(" (default)");
canonicalName = L"default"; canonicalName = L"default";
int sysLang = wxLocale::GetSystemLanguage(); int sysLang = wxLocale::GetSystemLanguage();

2
plugins/zerospu2/zerospu2.h
View File

@ -178,7 +178,7 @@ static __forceinline u16 c_offset(u32 ch)
return channel_test(ch) ? 0x0 : 0x400; return channel_test(ch) ? 0x0 : 0x400;
} }
static __forceinline tSPU_ATTR spu2attr(u32 channel) static __forceinline tSPU_ATTR &spu2attr(u32 channel)
{ {
return channel_test(channel) ? spu2attr0 : spu2attr1; return channel_test(channel) ? spu2attr0 : spu2attr1;
} }