Fix minor bug in NewUI and make frameskipping strings translatable.

This commit is contained in:
The Dax committed 2013-08-21 08:32:06 -04:00
1 parent c9447fbe67
commit 6150c6157d
2 files changed
+13 -9

No files matched your search

+1 -1
View File
@@ -232,7 +232,7 @@ void GameSettingsScreen::CreateViews() {
graphicsSettings->Add(new ItemHeader(gs->T("Frame Rate Control")));
static const char *frameSkip[] = {"Off", "Auto", "1", "2", "3", "4", "5", "6", "7", "8"};
graphicsSettings->Add(new PopupMultiChoice(&g_Config.iFrameSkip, gs->T("Frame Skipping"), frameSkip, 0, 9, gs, screenManager()));
graphicsSettings->Add(new PopupMultiChoice(&g_Config.iFrameSkip, gs->T("Frame Skipping"), frameSkip, 0, 10, gs, screenManager()));
static const char *fpsChoices[] = {"None", "Speed", "FPS", "Both"};
graphicsSettings->Add(new CheckBox(&cap60FPS_, gs->T("Force max 60 FPS (helps GoW)")));
+12 -8
View File
@@ -286,20 +286,24 @@ namespace MainWindow
char message[256];
memset(message, 0, sizeof(message));
const char *frameskipStr = g->T("Frameskipping");
const char *offStr = g->T("Off");
const char *autoStr = g->T("Auto");
const char *framesStr = g->T("Frames");
switch(g_Config.iFrameSkip) {
case 0:
sprintf(message, "Frameskipping: Off");
sprintf(message, "%s: %s", frameskipStr, offStr);
break;
case 1:
sprintf(message, "Frameskipping: Auto");
case 1:
sprintf(message, "%s: %s", frameskipStr, autoStr);
break;
default:
sprintf(message, "Frameskipping: %d frames", g_Config.iFrameSkip);
sprintf(message, "%s: %d %s", frameskipStr, g_Config.iFrameSkip, framesStr);
break;
}
osm.Show(g->T(message));
osm.Show(message);
}
void enableCheats(bool cheats) {
@@ -877,8 +881,8 @@ namespace MainWindow
setFrameSkipping(FRAMESKIP_OFF);
break;
case ID_OPTIONS_FRAMESKIP_1:
setFrameSkipping(FRAMESKIP_1);
case ID_OPTIONS_FRAMESKIP_AUTO:
setFrameSkipping(FRAMESKIP_AUTO);
break;
case ID_OPTIONS_FRAMESKIP_2: