cpp/openttd-patchpack/source Changeset - r22919:dfa6f4299122

Changeset - r22919:dfa6f4299122

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Alberth289346 - 6 years ago 2018-06-23 12:02:50
alberth289346@gmail.com

Feature #4186: Append '(City)' behind cities in the town directory (sbr)

2 files changed with 13 insertions and 2 deletions:

src/lang/english.txt

src/town_gui.cpp

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

@@ @@ -2980,6 +2980,7 @@ STR_EDIT_SIGN_SIGN_OSKTITLE @@
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Towns
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- None -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_TOWN_DIRECTORY_CITY                                         :{ORANGE}{TOWN}{YELLOW} (City){BLACK} ({COMMA})
 STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Town names - click on name to centre main view on town. Ctrl+Click opens a new viewport on town location
 STR_TOWN_POPULATION                                             :{BLACK}World population: {COMMA}

src/town_gui.cpp

➞

Show inline comments

@@ @@ -747,6 +747,16 @@ public: @@
+		}
+	}
 	/**
 	 * Get the string to draw the town name.
 	 * @param t Town to draw.
 	 * @return The string to use.
 	 */
 	static StringID GetTownString(const Town *t)
+	{
 		return t->larger_town ? STR_TOWN_DIRECTORY_CITY : STR_TOWN_DIRECTORY_TOWN;
+	}
 	virtual void DrawWidget(const Rect &r, int widget) const
+	{
 		switch (widget) {
@@ @@ -785,7 +795,7 @@ public: @@
 					SetDParam(0, t->index);
 					SetDParam(1, t->cache.population);
-					DrawString(text_left, text_right, y + (this->resize.step_height - FONT_HEIGHT_NORMAL) / 2, STR_TOWN_DIRECTORY_TOWN);
+					DrawString(text_left, text_right, y + (this->resize.step_height - FONT_HEIGHT_NORMAL) / 2, GetTownString(t));
 					y += this->resize.step_height;
 					if (++n == this->vscroll->GetCapacity()) break; // max number of towns in 1 window
@@ @@ -824,7 +834,7 @@ public: @@
 					SetDParam(0, t->index);
 					SetDParamMaxDigits(1, 8);
-					d = maxdim(d, GetStringBoundingBox(STR_TOWN_DIRECTORY_TOWN));
+					d = maxdim(d, GetStringBoundingBox(GetTownString(t)));
+				}
 				Dimension icon_size = GetSpriteSize(SPR_TOWN_RATING_GOOD);
 				d.width += icon_size.width + 2;

0 comments (0 inline, 0 general)