X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2FguiTable.cpp;h=ed5b0d87b0e07ee27d1fd2a276fcd00354a8fb8a;hb=a8e238ed06ee8285ed4459e9deda3117419837f6;hp=6dcd115b0eeae24bd7f41aabb2266656b230bd9a;hpb=6d61375cc72bad5c569d25c253adca4e3701dd27;p=dragonfireclient.git diff --git a/src/guiTable.cpp b/src/guiTable.cpp index 6dcd115b0..ed5b0d87b 100644 --- a/src/guiTable.cpp +++ b/src/guiTable.cpp @@ -33,7 +33,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/string.h" #include "util/numeric.h" #include "util/string.h" // for parseColorString() -#include "main.h" #include "settings.h" // for settings #include "porting.h" // for dpi #include "guiscalingfilter.h" @@ -930,7 +929,7 @@ s32 GUITable::allocString(const std::string &text) std::map::iterator it = m_alloc_strings.find(text); if (it == m_alloc_strings.end()) { s32 id = m_strings.size(); - std::wstring wtext = narrow_to_wide(text); + std::wstring wtext = utf8_to_wide(text); m_strings.push_back(core::stringw(wtext.c_str())); m_alloc_strings.insert(std::make_pair(text, id)); return id;