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

Fixed frameskipping when using default framefate settings (it wouldn't skip until games got REALLY slow, heh). Win32: Fixed BIOS settings saving in the Configuration dialog. (rama) 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@387 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
Jake.Stine 2008-12-04 14:42:09 +00:00 committed by Gregory Hainaut
parent 9f70fb2612
commit 61508452e7
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Counters.c
View File

@ -231,7 +231,7 @@ u32 UpdateVSyncRate()
if( m_iTicks != ticks ) if( m_iTicks != ticks )
{ {
m_iTicks = ticks; m_iTicks = ticks;
SysPrintf( limiterMsg, vSyncInfo.Framerate/100, vSyncInfo.Framerate%100 ); SysPrintf( limiterMsg, vSyncInfo.Framerate/50, vSyncInfo.Framerate%50 );
} }
} }

4
pcsx2/GS.cpp
View File

@ -308,14 +308,14 @@ static void OnModeChanged( u32 framerate, u32 iTicks )
{ {
m_iSlowStart = GetCPUTicks(); m_iSlowStart = GetCPUTicks();
u32 frameSkipThreshold = Config.CustomFrameSkip*100; u32 frameSkipThreshold = Config.CustomFrameSkip*50;
if( Config.CustomFrameSkip == 0) if( Config.CustomFrameSkip == 0)
{ {
// default: load the frameSkipThreshold with a value roughly 90% of our current framerate // default: load the frameSkipThreshold with a value roughly 90% of our current framerate
frameSkipThreshold = ( framerate * 228 ) / 256; frameSkipThreshold = ( framerate * 228 ) / 256;
} }
m_iSlowTicks = ( GetTickFrequency() * 100 ) / frameSkipThreshold; m_iSlowTicks = ( GetTickFrequency() * 50 ) / frameSkipThreshold;
// sanity check against users who set a "minimum" frame that's higher // sanity check against users who set a "minimum" frame that's higher
// than the maximum framerate: // than the maximum framerate:

3
pcsx2/windows/ConfigDlg.c
View File

@ -238,8 +238,6 @@ void OnOK(HWND hW) {
EndDialog(hW, TRUE); EndDialog(hW, TRUE);
SaveConfig();
// Apply winConfig settings: // Apply winConfig settings:
#define ApplyPluginPath( name ) strcpy( Config.name, winConfig.name ) #define ApplyPluginPath( name ) strcpy( Config.name, winConfig.name )
ApplyPluginPath( Bios ); ApplyPluginPath( Bios );
@ -252,6 +250,7 @@ void OnOK(HWND hW) {
ApplyPluginPath( USB ); ApplyPluginPath( USB );
ApplyPluginPath( FW ); ApplyPluginPath( FW );
SaveConfig();
needReset = 1; needReset = 1;
} }