From c03a1c9bd0ef6cf71de03a089f17bc682c8bf381 Mon Sep 17 00:00:00 2001 From: "ramapcsx2.code" Date: Fri, 31 Jan 2014 11:53:00 +0000 Subject: [PATCH] Small round of patches for various issues, #3. Fixed a bad string in the German translation, added GSdx-avx2 to the installer, silenced a debug print and shortened the app name in release builds. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5858 96395faa-99c1-11dd-bbfe-3dabce05a288 --- bin/Langs/de_DE/pcsx2_Main.mo | Bin 52352 -> 52365 bytes locales/de_DE/pcsx2_Main.po | 8 ++++---- nsis/pcsx2_full_install.nsi | 1 + pcsx2/System.cpp | 16 ++++++++++++---- pcsx2/gui/AppCoreThread.cpp | 23 +++++++++++++---------- pcsx2/gui/MainFrame.cpp | 4 +--- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/bin/Langs/de_DE/pcsx2_Main.mo b/bin/Langs/de_DE/pcsx2_Main.mo index 4060cfcafaac9bfff6a494fa9b8b30e050ba1583..aa71f3708fcf29dd4930910fd62f72e13e81a6a3 100644 GIT binary patch delta 4622 zcmXZedwkE=9mnxQE`AY_M2Lt;LV`+=CP+)L2z5z<&>9m%lZGi>T~eEge2G}aMu|kF zLmN@nDWPeFjA@0GX?49l=F;|2Hfv{j$RZ)DJ;q*d=lj?5e9rItJ(thW2^eixDlriRiYmCXmltN>AVAe8yBF)U5t8v6>7eXMXXd0meS#cJFy$?Lhbw=)QhK33%ZCM@C(#}zCykC zJ?gne)Oh!CFq-u?PH-KD%3um={Fx4oa2h!{8Q0)rco8$O6>~AQ*e+n7>mgJskGX#5 z8n(giY!YgxPh%I%!B~6=!|*jsM5l(vQ#5Yk2#o)=FL$|DLsyzumOGXbJX)! z-QQc>xLt`ol5kY9_CqZ^8I|D-)P@$I5AMOy)SuZ$!$Zg4TpQg7?xH6CFZ!WplQC1V z3o4a4s3UqAXX59s@xQV0denQ@&>wH2CT_-A*rtBwH(9^6JDr2t+4I;7*Sm2gjw7za zDfkezkSUvunTLCD7(PJN#Lz9qOvgM_>W^atUPKk&_ZWrVuWeQu3cjqmGUa z*yujc>gu=MW*`zZz$jF4W?)Cm!X(T_Eqn_q#ph59zm8hy9ZW#KGW%s5j(v!yIW%;? z^DzZ4qi#Xhay#IUQ4?%-eIL6Jx1e_DyTg832Vo}hO6-mG*cETO@qHXk9Pz51I2&V# zokAKqlf9^ct5Iio2A{xds2T{_X{$X6b#{fQ>-ZMx?2lk)tix!$fXdV@48tZ=5qc_Y zX8Ixl{J?h1Oq9*Wt%?{WNA15A++UY!u#(Y$RNf=bCf)Q-Y;+4~xcJ&EJ62aZQCoR2!w=TI3bb3KjIh;N}X zI&!x$gK#QpA!|_Mos`UPF4NFXTCp4U-D9gf1w)C)VSmg;DZo_R zfCI4sHDQbUyZ4*6W&%*}g`jR%6e=?VQ42~#)zUPFhIY0XhhaH-<3-ew`~_3-8tTj= z_S>CiU^;OQYG;RVE`ETK7=6I{Bh-6yu^(9us`}9v?(8qs(}>L_>)k@J`a20N(|TiFQcJ9Le;4I zd>S=y6KbcCZ`*5?jH>GCsA^u0UU&)h{%7dH8*cx(J7ZDtCv6Y+Y~ecy^&=-a5XJ&QWJ%c$b~7PaGMjKIKZ`};t2 z^x#k$ns_9tcvhmmVC8QAcla1_?<4k>q@yM(bmLMCCvHHc`Z{VsZJ3CGM{Ny^K^;}5 z>%61nzcU@n=}?N+p_|Kn2jOfCz>VmSJ8%x} zMP=e4YP?=GnH!uWSFbzArYdL~n9*lG_#ooz2v>M~Hj&qt+n zAx7hB)OTYSZo?}$92eKwTlOYSCjJJ~bpHqb(VpFlIG!I4V7{`*~xQ;1u! z1jnATU(SzF{lR~-wJ{%)h?ikD?n51!IZge*3|x+Z@ADrs^P3_X-S7_TUVA>^FBf)0 z#fwliuo7qCF4U3TMSXxgXRMuYI&lyNVlMW?6{rQhf;xgTn1@%<(F3XV_OIC-*Ag5> z|1s2nt*En{aMpf8b8sN>DonxsI2LbU4E8%`YaktUWXsSCUq=;j6_(@ebL3wuEpD(? zT!z}&e$-K%z;()%2cN{9*d9N{1pETE5byK0NRv(TRy8h7Q?&wBS>(8PANb*|26&MDWZ-&*iPiU7nZs^XRN+^K*ZeSJPHelJtKX CqyESM delta 4602 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 diff --git a/locales/de_DE/pcsx2_Main.po b/locales/de_DE/pcsx2_Main.po index 75fea1d30e..8d52ef737d 100644 --- a/locales/de_DE/pcsx2_Main.po +++ b/locales/de_DE/pcsx2_Main.po @@ -2,10 +2,10 @@ # This file is distributed under the same license as the PCSX2 package. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: pcsx2\n" "Report-Msgid-Bugs-To: http://code.google.com/p/pcsx2/\n" "POT-Creation-Date: 2014-01-30 20:26+0100\n" -"PO-Revision-Date: 2014-01-06 09:01+0100\n" +"PO-Revision-Date: 2014-01-31 11:43+0100\n" "Last-Translator: \n" "Language-Team: PCSX2\n" "Language: de_DE\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-KeywordsList: _;wxLt;pxL\n" -"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: ..\\..\\\n" "X-Generator: Poedit 1.6.3\n" "X-Poedit-SearchPath-0: pcsx2\n" @@ -1322,7 +1322,7 @@ msgstr "Aktiviere Cheats" #: pcsx2/gui/MainFrame.cpp:427 msgid "Enable Widescreen Patches" -msgstr "Aktiviere Speedhacks" +msgstr "Aktiviere Widescreen Patches" #: pcsx2/gui/MainFrame.cpp:430 msgid "Enable Host Filesystem" diff --git a/nsis/pcsx2_full_install.nsi b/nsis/pcsx2_full_install.nsi index 923842be34..5fe9622876 100644 --- a/nsis/pcsx2_full_install.nsi +++ b/nsis/pcsx2_full_install.nsi @@ -77,6 +77,7 @@ Section "!${APP_NAME} (required)" SEC_CORE File /nonfatal /oname=gsdx32-ssse3-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-ssse3.dll File /nonfatal /oname=gsdx32-sse4-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-sse4.dll File /nonfatal /oname=gsdx32-avx-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-avx.dll + File /nonfatal /oname=gsdx32-avx2-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-avx2.dll File /nonfatal /oname=zerogs-r${SVNREV_ZEROGS}.dll ..\bin\Plugins\zerogs.dll File /nonfatal /oname=spu2-x-r${SVNREV_SPU2X}.dll ..\bin\Plugins\spu2-x.dll diff --git a/pcsx2/System.cpp b/pcsx2/System.cpp index fa1180db86..5985da0a35 100644 --- a/pcsx2/System.cpp +++ b/pcsx2/System.cpp @@ -192,10 +192,18 @@ TraceLogFilters& SetTraceConfig() // This function should be called once during program execution. void SysLogMachineCaps() { - Console.WriteLn( Color_StrongGreen, "PCSX2 %u.%u.%u.r%d %s - compiled on " __DATE__, - PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, - SVN_REV, SVN_MODS ? "(modded)" : "" - ); + if ( !PCSX2_isReleaseVersion ) + { + Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u.r%d %s - compiled on " __DATE__, + PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, + SVN_REV, SVN_MODS ? "(modded)" : "" + ); + } + else { // shorter release version string + Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u.r%d - compiled on " __DATE__, + PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, + SVN_REV ); + } Console.WriteLn( "Savestate version: 0x%x", g_SaveVersion); Console.Newline(); diff --git a/pcsx2/gui/AppCoreThread.cpp b/pcsx2/gui/AppCoreThread.cpp index 9d558b159e..8e58d3d3b9 100644 --- a/pcsx2/gui/AppCoreThread.cpp +++ b/pcsx2/gui/AppCoreThread.cpp @@ -314,7 +314,7 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src ) int numberLoadedCheats; int numberLoadedWideScreenPatches; - int numberDbfCheatsLoaded; + int numberDbfCheatsLoaded; if (ElfCRC) gameCRC.Printf( L"%8.8x", ElfCRC ); if (!DiscSerial.IsEmpty()) gameSerial = L" [" + DiscSerial + L"]"; @@ -356,15 +356,17 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src ) gameName = L"Booting PS2 BIOS... "; } - ResetCheatsCount(); - //Till the end of this function, emtry CRC will be 00000000 - if (!gameCRC.Length()) { - Console.WriteLn(Color_Gray, "Cheats: No CRC, using 00000000 instead."); - gameCRC = L"00000000"; - } + ResetCheatsCount(); + + //Till the end of this function, entry CRC will be 00000000 + if (!gameCRC.Length() && (EmuConfig.EnableWideScreenPatches || EmuConfig.EnableCheats) ) { + Console.WriteLn(Color_Gray, "Patches: No CRC, using 00000000 instead."); + gameCRC = L"00000000"; + } + // regular cheat patches if (EmuConfig.EnableCheats) { - if (numberLoadedCheats = LoadCheats(gameCRC, PathDefs::GetCheats(), L"Cheats")) { + if (numberLoadedCheats = LoadCheats(gameCRC, PathDefs::GetCheats(), L"Cheats")) { gameCheats.Printf(L" [%d Cheats]", numberLoadedCheats); } } @@ -373,7 +375,8 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src ) if (EmuConfig.EnableWideScreenPatches) { if (numberLoadedWideScreenPatches = LoadCheats(gameCRC, PathDefs::GetCheatsWS(), L"Widescreen hacks")) { gameWsHacks.Printf(L" [%d widescreen hacks]", numberLoadedWideScreenPatches); - } else { + } + else { // No ws cheat files found at the cheats_ws folder, try the ws cheats zip file. wxString cheats_ws_archive = Path::Combine(PathDefs::GetProgramDataDir(), wxFileName(L"cheats_ws.zip")); @@ -384,7 +387,7 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src ) } } - Console.SetTitle(gameName+gameSerial+gameCompat+gameFixes+gamePatch+gameCheats+gameWsHacks); + Console.SetTitle(gameName + gameSerial + gameCompat + gameFixes + gamePatch + gameCheats + gameWsHacks); // Re-entry guard protects against cases where code wants to manually set core settings // which are not part of g_Conf. The subsequent call to apply g_Conf settings (which is diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp index f743a22244..f128074a44 100644 --- a/pcsx2/gui/MainFrame.cpp +++ b/pcsx2/gui/MainFrame.cpp @@ -352,9 +352,7 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title) if( PCSX2_isReleaseVersion ) { // stable releases, with a simple title. - wintitle.Printf( _("%s %d.%d.%d %s"), pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, - SVN_MODS ? _("(modded)") : wxEmptyString - ); + wintitle.Printf( _("%s %d.%d.%d"), pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo ); } else {