From 7c322ebcf109c26a109f896cc45bd72d463862fd Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Thu, 4 Apr 2024 20:27:11 +0100 Subject: [PATCH] Codechange: Define a ZOOM_LVL for minimum text effect visibility. --- src/texteff.cpp | 8 ++++---- src/zoom_type.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/texteff.cpp b/src/texteff.cpp index 01dca6087c..930df8421c 100644 --- a/src/texteff.cpp +++ b/src/texteff.cpp @@ -102,10 +102,10 @@ IntervalTimer move_all_text_effects_interval = {std::chrono::millis continue; } - te.MarkDirty(ZOOM_LVL_OUT_8X); + te.MarkDirty(ZOOM_LVL_TEXT_EFFECT); te.duration -= count; te.top -= count * ZOOM_LVL_BASE; - te.MarkDirty(ZOOM_LVL_OUT_8X); + te.MarkDirty(ZOOM_LVL_TEXT_EFFECT); } }}; @@ -118,13 +118,13 @@ void InitTextEffects() void DrawTextEffects(DrawPixelInfo *dpi) { /* Don't draw the text effects when zoomed out a lot */ - if (dpi->zoom > ZOOM_LVL_OUT_8X) return; + if (dpi->zoom > ZOOM_LVL_TEXT_EFFECT) return; if (IsTransparencySet(TO_TEXT)) return; for (TextEffect &te : _text_effects) { if (te.string_id == INVALID_STRING_ID) continue; if (te.mode == TE_RISING || _settings_client.gui.loading_indicators) { CopyInDParam(te.params); - ViewportAddString(dpi, ZOOM_LVL_OUT_8X, &te, te.string_id, te.string_id - 1, STR_NULL); + ViewportAddString(dpi, ZOOM_LVL_TEXT_EFFECT, &te, te.string_id, te.string_id - 1, STR_NULL); } } } diff --git a/src/zoom_type.h b/src/zoom_type.h index bc6d58d8be..f5db67e2fc 100644 --- a/src/zoom_type.h +++ b/src/zoom_type.h @@ -38,7 +38,8 @@ enum ZoomLevel : uint8_t { ZOOM_LVL_ROADVEH = ZOOM_LVL_OUT_4X, ///< Default zoom level for the road vehicle view. ZOOM_LVL_WORLD_SCREENSHOT = ZOOM_LVL_OUT_4X, ///< Default zoom level for the world screen shot. - ZOOM_LVL_DETAIL = ZOOM_LVL_OUT_8X, ///< All zoomlevels below or equal to this, will result in details on the screen, like road-work, ... + ZOOM_LVL_DETAIL = ZOOM_LVL_OUT_8X, ///< All zoom levels below or equal to this will result in details on the screen, like road-work, ... + ZOOM_LVL_TEXT_EFFECT = ZOOM_LVL_OUT_8X, ///< All zoom levels above this will not show text effects. ZOOM_LVL_MIN = ZOOM_LVL_NORMAL, ///< Minimum zoom level. ZOOM_LVL_MAX = ZOOM_LVL_OUT_32X, ///< Maximum zoom level.