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

Repaired a last-second oopsie from r588... and set it up so that game CRC is displayed in the console window title even when patches are disabled. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@590 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
Jake.Stine 2009-01-15 00:10:28 +00:00 committed by Gregory Hainaut
parent a251c8c67c
commit 1c17e8f37b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcsx2/Elfheader.cpp
View File

@ -501,21 +501,21 @@ struct ElfObject
void ElfApplyPatches() void ElfApplyPatches()
{ {
if( !Config.Patch ) return;
string filename; string filename;
ssprintf( filename, "%8.8x", params ElfCRC ); ssprintf( filename, "%8.8x", params ElfCRC );
// if patches found the following status msg will be overwritten // if patches found the following status msg will be overwritten
Console::SetTitle( fmt_string( "Game running without patches. [CRC=%hs]", params &filename ) ); Console::SetTitle( fmt_string( "Game running [CRC=%hs]", params &filename ) );
if( !Config.Patch ) return;
if(LoadPatch( filename ) != 0) if(LoadPatch( filename ) != 0)
{ {
Console::WriteLn("XML Loader returned an error. Trying to load a pnatch..."); Console::WriteLn("XML Loader returned an error. Trying to load a pnach...");
inifile_read( filename.c_str() ); inifile_read( filename.c_str() );
} }
else else
Console::WriteLn("XML Loading success. Will not load from pnatch..."); Console::WriteLn("XML Loading success. Will not load from pnach...");
applypatch( 0 ); applypatch( 0 );
} }

4
pcsx2/System.cpp
View File

@ -322,8 +322,8 @@ void SysResetExecutionState()
R5900::Cpu->Reset(); R5900::Cpu->Reset();
psxCpu->Reset(); psxCpu->Reset();
vuMicroCpuReset();
// make sure the VU1 doesn't have lingering "skip" enabled. // make sure the VU1 doesn't have lingering "skip" enabled.
vu1MicroDisableSkip(); vu1MicroDisableSkip();
vuMicroCpuReset();
} }

2
pcsx2/VUmicroMem.cpp
View File

@ -57,8 +57,8 @@ bool vu1MicroIsSkipping()
void vuMicroCpuReset() void vuMicroCpuReset()
{ {
CpuVU1 = CHECK_VU1REC ? &recVU1 : &intVU1;
CpuVU0 = CHECK_VU0REC ? &recVU0 : &intVU0; CpuVU0 = CHECK_VU0REC ? &recVU0 : &intVU0;
CpuVU1 = CHECK_VU1REC ? &recVU1 : &intVU1;
CpuVU0->Reset(); CpuVU0->Reset();
CpuVU1->Reset(); CpuVU1->Reset();