From ccc88e38b6288c4b91bb9930ba6a517f9c45e4ed Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Sun, 19 Dec 2010 08:45:54 +0000 Subject: [PATCH] wxSavestates: fix for GCC compilation error. git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxSavestates@4101 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/ps2/BiosTools.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pcsx2/ps2/BiosTools.cpp b/pcsx2/ps2/BiosTools.cpp index 21f0fc6501..99f5cb1256 100644 --- a/pcsx2/ps2/BiosTools.cpp +++ b/pcsx2/ps2/BiosTools.cpp @@ -62,9 +62,9 @@ Exception::BiosLoadFailed::BiosLoadFailed( const wxString& filename ) StreamName = filename; } -// This method throws a BadStream exception if the bios information could not be obtained. +// This method throws a BadStream exception if the bios information chould not be obtained. // (indicating that the file is invalid, incomplete, corrupted, or plain naughty). -static void LoadBiosVersion( pxInputStream& fp, u32& version, wxString& description, wxString& zoneStr=wxString() ) +static void LoadBiosVersion( pxInputStream& fp, u32& version, wxString& description, wxString& zoneStr ) { uint i; romdir rd; @@ -159,6 +159,12 @@ static void LoadBiosVersion( pxInputStream& fp, u32& version, wxString& descript } } +static void LoadBiosVersion( pxInputStream& fp, u32& version, wxString& description ) +{ + wxString zoneStr; + LoadBiosVersion( fp,version, description, zoneStr ); +} + template< size_t _size > void ChecksumIt( u32& result, const u8 (&srcdata)[_size] ) { @@ -256,7 +262,9 @@ void LoadBIOS() pxInputStream memfp( Bios, new wxMemoryInputStream( eeMem->ROM, sizeof(eeMem->ROM) ) ); LoadBiosVersion( memfp, BiosVersion, BiosDescription, biosZone ); - Console.SetTitle( pxsFmt( "Running BIOS (%s v%u.%u)", biosZone.c_str(), BiosChecksum, BiosVersion >> 8, BiosVersion & 0xff ) ); + Console.SetTitle( pxsFmt( L"Running BIOS (%s v%u.%u)", + biosZone.c_str(), BiosVersion >> 8, BiosVersion & 0xff + )); //injectIRX("host.irx"); //not fully tested; still buggy