Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Just use FPS except in the name.

Browse source 
Hopefully users don't get confused.  I don't think "internal FPS" is gonna
fit for all languages in a way that makes sense.
This commit is contained in:
Unknown W. Brackets 2013-06-30 00:03:32 -07:00
parent 3eb5e917ee
commit 5684c32165
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
UI/EmuScreen.cpp
View file

@ -358,9 +358,9 @@ void EmuScreen::render() {
case 1:
sprintf(fpsbuf, "Speed: %0.1f", vps); break;
case 2:
sprintf(fpsbuf, "FPES: %0.1f", fps); break;
sprintf(fpsbuf, "FPS: %0.1f", fps); break;
case 3:
sprintf(fpsbuf, "Speed: %5.1f\nFPES: %0.1f", vps, fps); break;
sprintf(fpsbuf, "Speed: %5.1f\nFPS: %0.1f", vps, fps); break;
}
ui_draw2d.DrawText(UBUNTU24, fpsbuf, dp_xres - 8, 12, 0xc0000000, ALIGN_TOPRIGHT);
ui_draw2d.DrawText(UBUNTU24, fpsbuf, dp_xres - 10, 10, 0xFF3fFF3f, ALIGN_TOPRIGHT);

8
UI/MenuScreens.cpp
View file

@ -971,14 +971,14 @@ void GraphicsScreenP3::render() {
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);
UICheckBox(GEN_ID, x, y += stride, gs->T("Show speed / internal FPS"), ALIGN_TOPLEFT, &ShowCounter);
if (ShowCounter) {
#ifdef _WIN32
const int checkboxH = 32;
#else
const int checkboxH = 48;
#endif
ui_draw2d.DrawTextShadow(UBUNTU24, gs->T("(60.0 is full speed, FPES depends on game)"), x + UI_SPACE + 29, (y += stride) + checkboxH / 2, 0xFFFFFFFF, ALIGN_LEFT | ALIGN_VCENTER);
ui_draw2d.DrawTextShadow(UBUNTU24, gs->T("(60.0 is full speed, internal FPS depends on game)"), x + UI_SPACE + 29, (y += stride) + checkboxH / 2, 0xFFFFFFFF, ALIGN_LEFT | ALIGN_VCENTER);
if (g_Config.iShowFPSCounter <= 0)
g_Config.iShowFPSCounter = 1;
@ -986,7 +986,7 @@ void GraphicsScreenP3::render() {
const char *type;
switch (g_Config.iShowFPSCounter) {
case 1: type = gs->T("Display: Speed"); break;
case 2: type = gs->T("Display: FPES"); break;
case 2: type = gs->T("Display: FPS"); break;
case 3: type = gs->T("Display: Both"); break;
}
@ -994,7 +994,7 @@ void GraphicsScreenP3::render() {
HLinear hlinear1(x + 260, y, 20);
if (UIButton(GEN_ID, hlinear1, 100, 0, gs->T("Speed"), ALIGN_LEFT))
g_Config.iShowFPSCounter = 1;
if (UIButton(GEN_ID, hlinear1, 100, 0, gs->T("FPES"), ALIGN_LEFT))
if (UIButton(GEN_ID, hlinear1, 100, 0, gs->T("FPS"), ALIGN_LEFT))
g_Config.iShowFPSCounter = 2;
if (UIButton(GEN_ID, hlinear1, 100, 0, gs->T("Both"), ALIGN_LEFT))
g_Config.iShowFPSCounter = 3;