Change the config setting to not say game.

This commit is contained in:
Unknown W. Brackets 2013-06-30 00:02:33 -07:00
parent 64e1ad3e5e
commit 3eb5e917ee
4 changed files with 8 additions and 8 deletions

View File

@ -105,7 +105,7 @@ void Config::Load(const char *iniFileName)
graphics->Get("VBO", &bUseVBO, false);
graphics->Get("FrameSkip", &iFrameSkip, 0);
graphics->Get("FrameRate", &iFpsLimit, 60);
graphics->Get("ForceGameFPS", &iForceGameFPS, 0);
graphics->Get("ForceMaxEmulatedFPS", &iForceMaxEmulatedFPS, 0);
#ifdef USING_GLES2
graphics->Get("AnisotropyLevel", &iAnisotropyLevel, 0);
#else
@ -223,7 +223,7 @@ void Config::Save()
graphics->Set("VBO", bUseVBO);
graphics->Set("FrameSkip", iFrameSkip);
graphics->Set("FrameRate", iFpsLimit);
graphics->Set("ForceGameFPS", iForceGameFPS);
graphics->Set("ForceMaxEmulatedFPS", iForceMaxEmulatedFPS);
graphics->Set("AnisotropyLevel", iAnisotropyLevel);
graphics->Set("VertexCache", bVertexCache);
graphics->Set("FullScreen", bFullScreen);

View File

@ -88,7 +88,7 @@ public:
int iTexScalingType; // 0 = xBRZ, 1 = Hybrid
bool bTexDeposterize;
int iFpsLimit;
int iForceGameFPS;
int iForceMaxEmulatedFPS;
int iMaxRecent;
bool bEnableCheats;
bool bReloadCheats;

View File

@ -514,9 +514,9 @@ u32 sceDisplaySetFramebuf(u32 topaddr, int linesize, int pixelformat, int sync)
if (topaddr != framebuf.topaddr) {
++numFlips;
if (g_Config.iForceGameFPS) {
if (g_Config.iForceMaxEmulatedFPS) {
u64 now = CoreTiming::GetTicks();
u64 expected = msToCycles(1000) / g_Config.iForceGameFPS;
u64 expected = msToCycles(1000) / g_Config.iForceMaxEmulatedFPS;
u64 actual = now - lastFlipCycles;
if (actual < expected)
hleEatCycles((int)(expected - actual));

View File

@ -966,9 +966,9 @@ void GraphicsScreenP3::render() {
int stride = 40;
int columnw = 400;
bool forceGameFPS60 = g_Config.iForceGameFPS == 60;
if (UICheckBox(GEN_ID, x, y += stride, gs->T("Force 60 FPS or less"), ALIGN_TOPLEFT, &forceGameFPS60))
g_Config.iForceGameFPS = forceGameFPS60 ? 60 : 0;
bool ForceMaxEmulatedFPS60 = g_Config.iForceMaxEmulatedFPS == 60;
if (UICheckBox(GEN_ID, x, y += stride, gs->T("Force 60 FPS or less"), ALIGN_TOPLEFT, &ForceMaxEmulatedFPS60))
g_Config.iForceMaxEmulatedFPS = ForceMaxEmulatedFPS60 ? 60 : 0;
bool ShowCounter = g_Config.iShowFPSCounter > 0;
UICheckBox(GEN_ID, x, y += stride, gs->T("Show speed / frames per emusecond"), ALIGN_TOPLEFT, &ShowCounter);