(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.

     - The formatting of the industry name can be controlled with the string STR_INDUSTRY_FORMAT.
Change: Changed several occurences of {STRING1} into {TOWN} to get rid of townnametype being used directly. 

1 files changed, 6 insertions, 6 deletions

diff --git a/town_cmd.c b/town_cmd.c
index 788765374..56413df66 100644
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -221,10 +221,10 @@ void UpdateTownVirtCoord(Town *t)
 
 	MarkTownSignDirty(t);
 	pt = RemapCoords2(TileX(t->xy) * 16, TileY(t->xy) * 16);
-	SetDParam(0, t->townnametype);
-	SetDParam(1, t->townnameparts);
-	SetDParam(2, t->population);
-	UpdateViewportSignPos(&t->sign, pt.x, pt.y - 24, _patches.population_in_label ? STR_TOWN_LABEL_POP : STR_2001);
+	SetDParam(0, t->index);
+	SetDParam(1, t->population);
+	UpdateViewportSignPos(&t->sign, pt.x, pt.y - 24,
+		_patches.population_in_label ? STR_TOWN_LABEL_POP : STR_TOWN_LABEL);
 	MarkTownSignDirty(t);
 }
 
@@ -911,8 +911,8 @@ restart:
 			if (t2->xy != 0) {
 				// We can't just compare the numbers since
 				// several numbers may map to a single name.
-				SetDParam(0, t2->townnameparts);
-				GetString(buf2, t2->townnametype);
+				SetDParam(0, t2->index);
+				GetString(buf2, STR_TOWN);
 				if (strcmp(buf1, buf2) == 0) {
 					if (tries-- < 0)
 						return false;