cpp/openttd-patchpack/source Changeset - r14829:db1930e2798e

Changeset - r14829:db1930e2798e

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

peter1138 - 14 years ago 2010-03-16 06:18:52
peter1138@openttd.org

(svn r19431) -Codechange: Append rail type speed limit (if set) to rail type selection list, and toolbar title.

3 files changed with 21 insertions and 2 deletions:

src/lang/english.txt

src/rail_gui.cpp

src/toolbar_gui.cpp

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

@@ @@ -4118,3 +4118,5 @@ STR_BUS @@
 STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})

src/rail_gui.cpp

➞

Show inline comments

@@ @@ -617,6 +617,8 @@ static const RailBuildingGUIButtonData _ @@
  * @param clicked_widget Widget clicked in the toolbar
  */
 struct BuildRailToolbarWindow : Window {
 	RailType railtype;
 	BuildRailToolbarWindow(const WindowDesc *desc, WindowNumber window_number, RailType railtype) : Window()
+	{
 		this->InitNested(desc);
@@ @@ -636,10 +638,11 @@ struct BuildRailToolbarWindow : Window { @@
 	 */
 	void SetupRailToolbar(RailType railtype)
+	{
 		this->railtype = railtype;
 		const RailtypeInfo *rti = GetRailTypeInfo(railtype);
 		assert(railtype < RAILTYPE_END);
-		this->GetWidget<NWidgetCore>(RTW_CAPTION)->widget_data      = rti->strings.toolbar_caption;
+		this->GetWidget<NWidgetCore>(RTW_CAPTION)->widget_data      = rti->max_speed > 0 ? STR_TOOLBAR_RAILTYPE_VELOCITY : STR_JUST_STRING;
 		this->GetWidget<NWidgetCore>(RTW_BUILD_NS)->widget_data     = rti->gui_sprites.build_ns_rail;
 		this->GetWidget<NWidgetCore>(RTW_BUILD_X)->widget_data      = rti->gui_sprites.build_x_rail;
 		this->GetWidget<NWidgetCore>(RTW_BUILD_EW)->widget_data     = rti->gui_sprites.build_ew_rail;
@@ @@ -689,6 +692,15 @@ struct BuildRailToolbarWindow : Window { @@
+		}
+	}
 	virtual void SetStringParameters(int widget) const
+	{
 		if (widget == RTW_CAPTION) {
 			const RailtypeInfo *rti = GetRailTypeInfo(this->railtype);
 			SetDParam(0, rti->strings.toolbar_caption);
 			SetDParam(1, rti->max_speed);
+		}
+	}
 	virtual void OnPaint()
+	{
 		this->DrawWidgets();

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -650,7 +650,12 @@ static void ToolbarBuildRailClick(Window @@
 		const RailtypeInfo *rti = GetRailTypeInfo(rt);
 		/* Skip rail type if it has no label */
 		if (rti->label == 0) continue;
 		list->push_back(new DropDownListStringItem(rti->strings.menu_text, rt, !HasBit(c->avail_railtypes, rt)));
 		StringID str = rti->max_speed > 0 ? STR_TOOLBAR_RAILTYPE_VELOCITY : STR_JUST_STRING;
 		DropDownListParamStringItem *item = new DropDownListParamStringItem(str, rt, !HasBit(c->avail_railtypes, rt));
 		item->SetParam(0, rti->strings.menu_text);
 		item->SetParam(1, rti->max_speed);
 		list->push_back(item);
+	}
 	ShowDropDownList(w, list, _last_built_railtype, TBN_RAILS, 140, true, true);
 	SndPlayFx(SND_15_BEEP);

0 comments (0 inline, 0 general)