Fix memory leaks due to messed up memory handling for particles as well as their...

[minetest.git] / src / chat.cpp

diff --git a/src/chat.cpp b/src/chat.cpp
index c3509ae49f288c1e6e553dc11cb647de0f18915c..b78b90145f2588e57d2de19fd5ad16cd2ba8e937 100644 (file)
--- a/src/chat.cpp
+++ b/src/chat.cpp
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "chat.h"
 #include "debug.h"
-#include <cassert>
+#include "strfnd.h"
 #include <cctype>
 #include <sstream>
 #include "util/string.h"
@@ -117,8 +117,8 @@ void ChatBuffer::deleteOldest(u32 count)
                --count;
        }
 
-       m_unformatted.erase(0, del_unformatted);
-       m_formatted.erase(0, del_formatted);
+       m_unformatted.erase(m_unformatted.begin(), m_unformatted.begin() + del_unformatted);
+       m_formatted.erase(m_formatted.begin(), m_formatted.begin() + del_formatted);
 }
 
 void ChatBuffer::deleteByAge(f32 maxAge)
@@ -151,7 +151,7 @@ void ChatBuffer::reformat(u32 cols, u32 rows)
        }
        else if (cols != m_cols || rows != m_rows)
        {
-               // TODO: Avoid reformatting ALL lines (even inivisble ones)
+               // TODO: Avoid reformatting ALL lines (even invisible ones)
                // each time the console size changes.
 
                // Find out the scroll position in *unformatted* lines
@@ -232,10 +232,10 @@ void ChatBuffer::scrollTop()
 }
 
 u32 ChatBuffer::formatChatLine(const ChatLine& line, u32 cols,
-               core::array<ChatFormattedLine>& destination) const
+               std::vector<ChatFormattedLine>& destination) const
 {
        u32 num_added = 0;
-       core::array<ChatFormattedFragment> next_frags;
+       std::vector<ChatFormattedFragment> next_frags;
        ChatFormattedLine next_line;
        ChatFormattedFragment temp_frag;
        u32 out_column = 0;
@@ -292,7 +292,7 @@ u32 ChatBuffer::formatChatLine(const ChatLine& line, u32 cols,
                                frag.column = out_column;
                                next_line.fragments.push_back(frag);
                                out_column += frag.text.size();
-                               next_frags.erase(0, 1);
+                               next_frags.erase(next_frags.begin());
                        }
                        else
                        {
@@ -407,6 +407,15 @@ void ChatPrompt::input(wchar_t ch)
        m_nick_completion_end = 0;
 }
 
+void ChatPrompt::input(const std::wstring &str)
+{
+       m_line.insert(m_cursor, str);
+       m_cursor += str.size();
+       clampView();
+       m_nick_completion_start = 0;
+       m_nick_completion_end = 0;
+}
+
 std::wstring ChatPrompt::submit()
 {
        std::wstring line = m_line;
@@ -414,7 +423,7 @@ std::wstring ChatPrompt::submit()
        if (!line.empty())
                m_history.push_back(line);
        if (m_history.size() > m_history_limit)
-               m_history.erase(0);
+               m_history.erase(m_history.begin());
        m_history_index = m_history.size();
        m_view = 0;
        m_cursor = 0;
@@ -464,7 +473,7 @@ void ChatPrompt::historyNext()
        }
 }
 
-void ChatPrompt::nickCompletion(const core::list<std::wstring>& names, bool backwards)
+void ChatPrompt::nickCompletion(const std::list<std::string>& names, bool backwards)
 {
        // Two cases:
        // (a) m_nick_completion_start == m_nick_completion_end == 0
@@ -492,14 +501,14 @@ void ChatPrompt::nickCompletion(const core::list<std::wstring>& names, bool back
        std::wstring prefix = m_line.substr(prefix_start, prefix_end - prefix_start);
 
        // find all names that start with the selected prefix
-       core::array<std::wstring> completions;
-       for (core::list<std::wstring>::ConstIterator
+       std::vector<std::wstring> completions;
+       for (std::list<std::string>::const_iterator
                        i = names.begin();
-                       i != names.end(); i++)
+                       i != names.end(); ++i)
        {
-               if (str_starts_with(*i, prefix, true))
+               if (str_starts_with(narrow_to_wide(*i), prefix, true))
                {
-                       std::wstring completion = *i;
+                       std::wstring completion = narrow_to_wide(*i);
                        if (prefix_start == 0)
                                completion += L":";
                        completions.push_back(completion);