From 033ecabcf225199c61e886a21dab72a40e34634e Mon Sep 17 00:00:00 2001 From: "gregory.hainaut@gmail.com" Date: Fri, 29 Apr 2011 21:02:31 +0000 Subject: [PATCH] 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 --- pcsx2/gui/i18n.cpp | 1 + plugins/zerospu2/zerospu2.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pcsx2/gui/i18n.cpp b/pcsx2/gui/i18n.cpp index e20fa24c70..2e835f2459 100644 --- a/pcsx2/gui/i18n.cpp +++ b/pcsx2/gui/i18n.cpp @@ -60,6 +60,7 @@ LangPackEnumeration::LangPackEnumeration() { wxLangId = wxLANGUAGE_DEFAULT; englishName = L" System Default"; // left-side space forces it to sort to the front of the lists + englishName += _(" (default)"); canonicalName = L"default"; int sysLang = wxLocale::GetSystemLanguage(); diff --git a/plugins/zerospu2/zerospu2.h b/plugins/zerospu2/zerospu2.h index c34e4a94a8..b70fe29f66 100644 --- a/plugins/zerospu2/zerospu2.h +++ b/plugins/zerospu2/zerospu2.h @@ -178,7 +178,7 @@ static __forceinline u16 c_offset(u32 ch) 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; }