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

Fixed bug where plugin configuration changes didn't take effect until restart. Plus a few code cleanups. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@312 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
Jake.Stine 2008-11-11 09:57:25 +00:00 committed by Gregory Hainaut
parent 44699ebf68
commit 8fe6b24cc2
4 changed files with 26 additions and 458 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/Counters.c
View File

@ -111,7 +111,6 @@ void rcntInit() {
// debug code, used for stats
int g_nCounters[4];
extern u32 s_lastvsync[2];
static int iFrame = 0;
#ifndef _WIN32

466
pcsx2/PsxHw.c
View File

File diff suppressed because it is too large Load Diff

15
pcsx2/windows/ConfigDlg.c
View File

@ -239,6 +239,19 @@ void OnOK(HWND hW) {
EndDialog(hW, TRUE);
SaveConfig();
// Apply winConfig settings:
#define ApplyPluginPath( name ) memcpy(Config.name, winConfig.name, g_MaxPath )
ApplyPluginPath( Bios );
ApplyPluginPath( GS );
ApplyPluginPath( PAD1 );
ApplyPluginPath( PAD2 );
ApplyPluginPath( SPU2 );
ApplyPluginPath( CDVD );
ApplyPluginPath( DEV9 );
ApplyPluginPath( USB );
ApplyPluginPath( FW );
needReset = 1;
}
@ -414,7 +427,7 @@ void SetBiosDir(HWND hW) {
char Path[g_MaxPath];
if (SelectPath(hW, _("Select Bios Directory"), Path) == -1) return;
strcpy(Config.BiosDir, Path);
strcpy(winConfig.BiosDir, Path);
CleanUpCombos(hW);
OnConfigureDialog(hW);
}

2
pcsx2/x86/iPsxHw.c
View File

@ -328,9 +328,7 @@ int psxHwConstRead32(u32 x86reg, u32 add) {
//case 0x1f801050: hard = serial_read32(); break;//serial port
case 0x1f801078:
#ifdef PSXHW_LOG
PSXHW_LOG("ICTRL 32bit read %x\n", psxHu32(0x1078));
#endif
_eeReadConstMem32(x86reg, (uptr)&psxH[add&0xffff]);
MOV32ItoM((uptr)&psxH[add&0xffff], 0);
return 0;