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

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
This commit is contained in:
ramapcsx2.code 2014-01-31 11:53:00 +00:00
parent 1c5cec4647
commit c03a1c9bd0
6 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/Langs/de_DE/pcsx2_Main.mo
View File

Binary file not shown.

8
locales/de_DE/pcsx2_Main.po
View File

@ -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"

1
nsis/pcsx2_full_install.nsi
View File

@ -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

16
pcsx2/System.cpp
View File

@ -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();

23
pcsx2/gui/AppCoreThread.cpp
View File

@ -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

4
pcsx2/gui/MainFrame.cpp
View File

@ -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
{