Add count based unload limit for mapblocks

[dragonfireclient.git] / src / guiTable.cpp

diff --git a/src/guiTable.cpp b/src/guiTable.cpp
index 6dcd115b0eeae24bd7f41aabb2266656b230bd9a..ed5b0d87b0e07ee27d1fd2a276fcd00354a8fb8a 100644 (file)
--- 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<std::string, s32>::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;