cpp/openttd-patchpack/source Changeset - r18465:95d781aa9dc8

Changeset - r18465:95d781aa9dc8

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

peter1138 - 13 years ago 2011-11-24 17:37:20
peter1138@openttd.org

(svn r23319) -Fix (r23316): Offsets of viewport signs were not scaled up.

4 files changed with 5 insertions and 5 deletions:

src/signs.cpp

src/station_cmd.cpp

src/town_cmd.cpp

src/waypoint_cmd.cpp

0 comments (0 inline, 0 general)

src/signs.cpp

➞

Show inline comments

@@ @@ -47,7 +47,7 @@ void Sign::UpdateVirtCoord() @@
+{
 	Point pt = RemapCoords(this->x, this->y, this->z);
 	SetDParam(0, this->index);
 	this->sign.UpdatePosition(pt.x, pt.y - 6, STR_WHITE_SIGN);
+	this->sign.UpdatePosition(pt.x, pt.y - 6 * ZOOM_LVL_BASE, STR_WHITE_SIGN);
+}
 /** Update the coordinates of all signs */

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -395,8 +395,8 @@ void Station::UpdateVirtCoord() @@
+{
 	Point pt = RemapCoords2(TileX(this->xy) * TILE_SIZE, TileY(this->xy) * TILE_SIZE);
 	pt.y -= 32;
 	if ((this->facilities & FACIL_AIRPORT) && this->airport.type == AT_OILRIG) pt.y -= 16;
 	pt.y -= 32 * ZOOM_LVL_BASE;
 	if ((this->facilities & FACIL_AIRPORT) && this->airport.type == AT_OILRIG) pt.y -= 16 * ZOOM_LVL_BASE;
 	SetDParam(0, this->index);
 	SetDParam(1, this->facilities);

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -355,7 +355,7 @@ void Town::UpdateVirtCoord() @@
 	Point pt = RemapCoords2(TileX(this->xy) * TILE_SIZE, TileY(this->xy) * TILE_SIZE);
 	SetDParam(0, this->index);
 	SetDParam(1, this->population);
 	this->sign.UpdatePosition(pt.x, pt.y - 24,
+	this->sign.UpdatePosition(pt.x, pt.y - 24 * ZOOM_LVL_BASE,
 		_settings_client.gui.population_in_label ? STR_VIEWPORT_TOWN_POP : STR_VIEWPORT_TOWN);
 	SetWindowDirty(WC_TOWN_VIEW, this->index);

src/waypoint_cmd.cpp

➞

Show inline comments

@@ @@ -38,7 +38,7 @@ void Waypoint::UpdateVirtCoord() @@
+{
 	Point pt = RemapCoords2(TileX(this->xy) * TILE_SIZE, TileY(this->xy) * TILE_SIZE);
 	SetDParam(0, this->index);
-	this->sign.UpdatePosition(pt.x, pt.y - 0x20, STR_VIEWPORT_WAYPOINT);
+	this->sign.UpdatePosition(pt.x, pt.y - 32 * ZOOM_LVL_BASE, STR_VIEWPORT_WAYPOINT);
 	/* Recenter viewport */
 	InvalidateWindowData(WC_WAYPOINT_VIEW, this->index);
+}

0 comments (0 inline, 0 general)