From a5c718701779096d214a9afca50206eb474da00a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Przyby=C5=82?= <matt@przybyl.io>
Date: Wed, 22 Jul 2020 00:37:37 +0200
Subject: [PATCH] Fix crashes on SatCom in Moon missions (#1334)

---
 src/graphics/engine/text.cpp | 38 +++++++++++++++++++-----------------
 src/graphics/engine/text.h   |  2 ++
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/graphics/engine/text.cpp b/src/graphics/engine/text.cpp
index 484a7374..9ff42bb6 100644
--- a/src/graphics/engine/text.cpp
+++ b/src/graphics/engine/text.cpp
@@ -430,7 +430,7 @@ float CText::GetStringWidth(const std::string &text,
 
         UTF8Char ch;
 
-        int len = StrUtils::Utf8CharSizeAt(text, index);
+        int len = GetCharSizeAt(font, text, index);
         if (len >= 1)
             ch.c1 = text[index];
         if (len >= 2)
@@ -565,7 +565,7 @@ int CText::Justify(const std::string &text, std::vector<FontMetaChar>::iterator
 
         UTF8Char ch;
 
-        int len = StrUtils::Utf8CharSizeAt(text, index);
+        int len = GetCharSizeAt(font, text, index);
         if (len >= 1)
             ch.c1 = text[index];
         if (len >= 2)
@@ -606,7 +606,7 @@ int CText::Justify(const std::string &text, FontType font, float size, float wid
     {
         UTF8Char ch;
 
-        int len = StrUtils::Utf8CharSizeAt(text, index);
+        int len = GetCharSizeAt(font, text, index);
         if (len >= 1)
             ch.c1 = text[index];
         if (len >= 2)
@@ -648,12 +648,9 @@ int CText::Detect(const std::string &text, std::vector<FontMetaChar>::iterator f
         if (format + fmtIndex != end)
             font = static_cast<FontType>(*(format + fmtIndex) & FONT_MASK_FONT);
 
-        // TODO: if (font == FONT_BUTTON)
-        //if (font == FONT_BUTTON) continue;
-
         UTF8Char ch;
 
-        int len = StrUtils::Utf8CharSizeAt(text, index);
+        int len = GetCharSizeAt(font, text, index);
         if (len >= 1)
             ch.c1 = text[index];
         if (len >= 2)
@@ -686,7 +683,7 @@ int CText::Detect(const std::string &text, FontType font, float size, float offs
     {
         UTF8Char ch;
 
-        int len = StrUtils::Utf8CharSizeAt(text, index);
+        int len = GetCharSizeAt(font, text, index);
         if (len >= 1)
             ch.c1 = text[index];
         if (len >= 2)
@@ -898,16 +895,7 @@ void CText::StringToUTFCharList(const std::string &text, std::vector<UTF8Char> &
         if (format + index != end)
             font = static_cast<FontType>(*(format + index) & FONT_MASK_FONT);
 
-        int len;
-
-        if(font == FONT_BUTTON)
-        {
-            len = 1;
-        }
-        else
-        {
-            len = StrUtils::Utf8CharSizeAt(text, index);
-        }
+        int len = GetCharSizeAt(font, text, index);
 
         if (len >= 1)
             ch.c1 = text[index];
@@ -922,6 +910,20 @@ void CText::StringToUTFCharList(const std::string &text, std::vector<UTF8Char> &
     }
 }
 
+int CText::GetCharSizeAt(Gfx::FontType font, const std::string& text, unsigned int index) const
+{
+    int len = 0;
+    if (font == FONT_BUTTON)
+    {
+        len = 1;
+    }
+    else
+    {
+        len = StrUtils::Utf8CharSizeAt(text, index);
+    }
+    return len;
+}
+
 void CText::DrawString(const std::string &text, FontType font,
                        float size, Math::IntPoint pos, int width, int eol, Color color)
 {
diff --git a/src/graphics/engine/text.h b/src/graphics/engine/text.h
index 3a5bff88..d0abbcee 100644
--- a/src/graphics/engine/text.h
+++ b/src/graphics/engine/text.h
@@ -337,6 +337,8 @@ protected:
     void        StringToUTFCharList(const std::string &text, std::vector<UTF8Char> &chars);
     void        StringToUTFCharList(const std::string &text, std::vector<UTF8Char> &chars, std::vector<FontMetaChar>::iterator format, std::vector<FontMetaChar>::iterator end);
 
+    int GetCharSizeAt(Gfx::FontType font, const std::string& text, unsigned int index) const;
+
 protected:
     CEngine*       m_engine;
     CDevice*       m_device;