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

wxSavestates: fix for GCC compilation error. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxSavestates@4101 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-12-19 08:45:54 +00:00
parent 262dc135fa
commit ccc88e38b6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcsx2/ps2/BiosTools.cpp
View File

@ -62,9 +62,9 @@ Exception::BiosLoadFailed::BiosLoadFailed( const wxString& filename )
StreamName = 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). // (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; uint i;
romdir rd; 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 > template< size_t _size >
void ChecksumIt( u32& result, const u8 (&srcdata)[_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) ) ); pxInputStream memfp( Bios, new wxMemoryInputStream( eeMem->ROM, sizeof(eeMem->ROM) ) );
LoadBiosVersion( memfp, BiosVersion, BiosDescription, biosZone ); 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 //injectIRX("host.irx"); //not fully tested; still buggy