gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r24298) -Feature: Display default values for adv. settings in the settings description.

Browse Source
This commit is contained in:
frosch 2012-05-28 13:34:46 +00:00
parent 09bdd4c773
commit f9df5f65c7
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lang/english.txt
View File

@ -1104,6 +1104,7 @@ STR_WARNING_DIFFICULTY_TO_CUSTOM :{WHITE}This act
# Advanced settings window # Advanced settings window
STR_CONFIG_SETTING_CAPTION :{WHITE}Advanced Settings STR_CONFIG_SETTING_CAPTION :{WHITE}Advanced Settings
STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT :(no explanation available) STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT :(no explanation available)
STR_CONFIG_SETTING_DEFAULT_VALUE :{LTBLUE}Default value: {ORANGE}{STRING1}
STR_CONFIG_SETTING_OFF :Off STR_CONFIG_SETTING_OFF :Off
STR_CONFIG_SETTING_ON :On STR_CONFIG_SETTING_ON :On

13
src/settings_gui.cpp
View File

@ -1738,7 +1738,8 @@ struct GameSettingsWindow : Window {
break; break;
case WID_GS_HELP_TEXT: case WID_GS_HELP_TEXT:
size->height = max(size->height, _settings_main_page.GetMaxHelpHeight(size->width)); size->height = FONT_HEIGHT_NORMAL + WD_PAR_VSEP_NORMAL +
max(size->height, _settings_main_page.GetMaxHelpHeight(size->width));
break; break;
default: default:
@ -1756,7 +1757,15 @@ struct GameSettingsWindow : Window {
case WID_GS_HELP_TEXT: case WID_GS_HELP_TEXT:
if (this->last_clicked != NULL) { if (this->last_clicked != NULL) {
DrawStringMultiLine(r.left, r.right, r.top, r.bottom, this->last_clicked->GetHelpText(), TC_WHITE); const SettingDesc *sd = this->last_clicked->d.entry.setting;
int32 default_value = ReadValue(&sd->desc.def, sd->save.conv);
this->last_clicked->SetValueDParams(0, default_value);
int y = r.top;
DrawString(r.left, r.right, y, STR_CONFIG_SETTING_DEFAULT_VALUE);
y += FONT_HEIGHT_NORMAL + WD_PAR_VSEP_NORMAL;
DrawStringMultiLine(r.left, r.right, y, r.bottom, this->last_clicked->GetHelpText(), TC_WHITE);
} }
break; break;