From 22f78ea38e415c40ef445786b77788a40f4ddac3 Mon Sep 17 00:00:00 2001 From: Craig Robbins Date: Tue, 24 May 2016 00:27:11 +1000 Subject: Fix irrlicht version checking macro for tooltip_height calculation --- src/guiFormSpecMenu.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/guiFormSpecMenu.cpp') diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index b0215a84a..99b1153c1 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -2265,10 +2265,10 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase, this->bringToFront(m_tooltip_element); m_tooltip_element->setText(tooltip_text.c_str()); s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height; -#if IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8 && IRRLICHT_VERSION_REVISION >= 2 - s32 tooltip_height = m_tooltip_element->getTextHeight() + 5; -#else +#if IRRLICHT_VERSION_MAJOR <= 1 && IRRLICHT_VERSION_MINOR <= 8 && IRRLICHT_VERSION_REVISION < 2 s32 tooltip_height = m_tooltip_element->getTextHeight() * tt_rows.size() + 5; +#else + s32 tooltip_height = m_tooltip_element->getTextHeight() + 5; #endif v2u32 screenSize = driver->getScreenSize(); int tooltip_offset_x = m_btn_height; -- cgit v1.2.3