From 337e577d6f474b3d85d52736b14953c5f948d65a Mon Sep 17 00:00:00 2001 From: Deve Date: Sun, 18 Nov 2018 21:42:42 +0100 Subject: [PATCH] Assume that there are always 2 text lines in touch gui. It fixes overlapping text in CTF/Soccer. --- src/states_screens/race_gui.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp index c5dc8c0cb..665b6d84a 100644 --- a/src/states_screens/race_gui.cpp +++ b/src/states_screens/race_gui.cpp @@ -117,8 +117,7 @@ RaceGUI::RaceGUI() // Originally m_map_height was 100, and we take 480 as minimum res float scaling = irr_driver->getFrameSize().Height / 480.0f; const float map_size = stk_config->m_minimap_size * map_size_splitscreen; - const float top_margin = world->raceHasLaps() ? 3.5f * m_font_height - : 1.8f * m_font_height; + const float top_margin = 3.5f * m_font_height; if (UserConfigParams::m_multitouch_enabled && UserConfigParams::m_multitouch_mode != 0 && @@ -499,7 +498,7 @@ void RaceGUI::drawGlobalMiniMap() if (m_multitouch_gui != NULL) { - float max_scale = World::getWorld()->raceHasLaps() ? 1.3f : 1.5f; + float max_scale = 1.3f; if (UserConfigParams::m_multitouch_scale > max_scale) return;