From 98cf7f5c7b6d107a488635178f8cad7e9bc96ffe Mon Sep 17 00:00:00 2001 From: truelight Date: Sat, 26 May 2007 12:19:54 +0000 Subject: (svn r9932) -Fix: can't assume a zoom-level with MarkAllViewportsDirty, causing segfaults when trying to load savegames in dedicated server via -g (reported by peter1138) --- src/signs.cpp | 7 +++++-- src/station.cpp | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/signs.cpp b/src/signs.cpp index 428fdcf40..8f3f0f365 100644 --- a/src/signs.cpp +++ b/src/signs.cpp @@ -64,11 +64,14 @@ void UpdateAllSignVirtCoords() */ static void MarkSignDirty(Sign *si) { + /* We use ZOOM_LVL_MAX here, as every viewport can have an other zoom, + * and there is no way for us to know which is the biggest. So make the + * biggest area dirty, and we are safe for sure. */ MarkAllViewportsDirty( si->sign.left - 6, si->sign.top - 3, - si->sign.left + ScaleByZoom(si->sign.width_1 + 12, _cur_dpi->zoom), - si->sign.top + ScaleByZoom(12, _cur_dpi->zoom)); + si->sign.left + ScaleByZoom(si->sign.width_1 + 12, ZOOM_LVL_MAX), + si->sign.top + ScaleByZoom(12, ZOOM_LVL_MAX)); } /** diff --git a/src/station.cpp b/src/station.cpp index 2c17406f0..2234e8417 100644 --- a/src/station.cpp +++ b/src/station.cpp @@ -122,11 +122,14 @@ void Station::MarkDirty() const if (sign.width_1 != 0) { InvalidateWindowWidget(WC_STATION_VIEW, index, 1); + /* We use ZOOM_LVL_MAX here, as every viewport can have an other zoom, + * and there is no way for us to know which is the biggest. So make the + * biggest area dirty, and we are safe for sure. */ MarkAllViewportsDirty( sign.left - 6, sign.top, - sign.left + ScaleByZoom(sign.width_1 + 12, _cur_dpi->zoom), - sign.top + ScaleByZoom(12, _cur_dpi->zoom)); + sign.left + ScaleByZoom(sign.width_1 + 12, ZOOM_LVL_MAX), + sign.top + ScaleByZoom(12, ZOOM_LVL_MAX)); } } -- cgit v1.2.3-70-g09d2