cpp/openttd-patchpack/source Changeset - r19383:0880476c18ea

Changeset - r19383:0880476c18ea

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

frosch - 12 years ago 2012-05-28 13:34:46
frosch@openttd.org

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

2 files changed with 12 insertions and 2 deletions:

src/lang/english.txt

src/settings_gui.cpp

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

@@ @@ -1101,12 +1101,13 @@ STR_CITY_APPROVAL_HOSTILE @@
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}No suitable AIs available...{}You can download several AIs via the 'Online Content' system
 STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}This action changed the difficulty level to custom
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Advanced Settings
 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_ON                                           :On
 STR_CONFIG_SETTING_DISABLED                                     :disabled
 STR_CONFIG_SETTING_COMPANIES_OFF                                :Off

src/settings_gui.cpp

➞

Show inline comments

@@ @@ -1735,13 +1735,14 @@ struct GameSettingsWindow : Window { @@
 				resize->width  = 1;
 				size->height = 5 * resize->height + SETTINGTREE_TOP_OFFSET + SETTINGTREE_BOTTOM_OFFSET;
 				break;
 			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;
 			default:
 				break;
+		}
+	}
@@ @@ -1753,13 +1754,21 @@ struct GameSettingsWindow : Window { @@
 				_settings_main_page.Draw(settings_ptr, r.left + SETTINGTREE_LEFT_OFFSET, r.right - SETTINGTREE_RIGHT_OFFSET, r.top + SETTINGTREE_TOP_OFFSET,
 						this->vscroll->GetPosition(), this->vscroll->GetPosition() + this->vscroll->GetCapacity(), this->last_clicked);
 				break;
 			case WID_GS_HELP_TEXT:
 				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;
 			default:
 				break;
+		}

0 comments (0 inline, 0 general)