summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2011-11-24 17:37:20 +0000
committerpeter1138 <peter1138@openttd.org>2011-11-24 17:37:20 +0000
commit3e1d07041350c923d08275a22b0745a0edc4cbfc (patch)
treeeabbed1e6e2430dd42304425b38c2739118e7706 /src
parent7337e7ff49f9a86280114a4796c8eefb0a3c0609 (diff)
downloadopenttd-3e1d07041350c923d08275a22b0745a0edc4cbfc.tar.xz
(svn r23319) -Fix (r23316): Offsets of viewport signs were not scaled up.
Diffstat (limited to 'src')
-rw-r--r--src/signs.cpp2
-rw-r--r--src/station_cmd.cpp4
-rw-r--r--src/town_cmd.cpp2
-rw-r--r--src/waypoint_cmd.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/signs.cpp b/src/signs.cpp
index 2ab678a23..53465fc8a 100644
--- a/src/signs.cpp
+++ b/src/signs.cpp
@@ -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 */
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index b772da079..bb4595381 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -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);
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index e303a2515..745eed350 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -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);
diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
index 62b733bd0..f7d6a1d6b 100644
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -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);
}