From 315b18e8eb169d0b23626fba337ab2ba693de480 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Tue, 26 Jun 2018 18:17:25 +0200 Subject: [PATCH] Use the progress function only where necessary And prefer static on the way. --- src/event.cxx | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/event.cxx b/src/event.cxx index 5201f93..945f5bc 100644 --- a/src/event.cxx +++ b/src/event.cxx @@ -2830,7 +2830,6 @@ CEvent::HideMouse (bool bHide) bool CEvent::EventButtons (const SDL_Event & event, Point pos) { - Point test; Sint32 lg; Sounds sound; @@ -2838,27 +2837,27 @@ CEvent::EventButtons (const SDL_Event & event, Point pos) m_textToolTips[0] = 0; m_posToolTips.x = -1; - const auto progress = [&](CJauge & prog, const char * text) -> bool { - if (prog.GetHide ()) - return false; - - test = prog.GetPos (); - if ( - pos.x >= test.x && pos.x <= test.x + DIMJAUGEX && pos.y >= test.y && - pos.y <= test.y + DIMJAUGEY) - { - snprintf (m_textToolTips, sizeof (m_textToolTips), "%s", text); - lg = GetTextWidth (m_textToolTips); - test.x += (DIMJAUGEX - lg) / 2; - test.y += 4; - m_posToolTips = test; - return true; - } - return false; - }; - if (m_phase == EV_PHASE_PLAY) { + const static auto progress = [&](CJauge & prog, const char * text) -> bool { + if (prog.GetHide ()) + return false; + + Point test = prog.GetPos (); + if ( + pos.x >= test.x && pos.x <= test.x + DIMJAUGEX && pos.y >= test.y && + pos.y <= test.y + DIMJAUGEY) + { + snprintf (m_textToolTips, sizeof (m_textToolTips), "%s", text); + lg = GetTextWidth (m_textToolTips); + test.x += (DIMJAUGEX - lg) / 2; + test.y += 4; + m_posToolTips = test; + return true; + } + return false; + }; + const auto spotted = progress (m_jauges[0], gettext ("Blupi's energy")); if (!spotted) progress (m_jauges[1], gettext ("Work done"));