don't pass g_settings around, and use it directly

[dragonfireclient.git] / src / chat.cpp

diff --git a/src/chat.cpp b/src/chat.cpp
index 967e159f8a7ac1e6257c0a1d224def386a589197..a5d82a6494289938bc011d71a014909075327a0c 100644 (file)
--- a/src/chat.cpp
+++ b/src/chat.cpp
@@ -369,12 +369,11 @@ s32 ChatBuffer::getBottomScrollPos() const
        return formatted_count - rows;
 }
 
-void ChatBuffer::resize(u32 scrollback) {
+void ChatBuffer::resize(u32 scrollback)
+{
        m_scrollback = scrollback;
        if (m_unformatted.size() > m_scrollback)
-       {
                deleteOldest(m_unformatted.size() - m_scrollback);
-       }       
 }
 
 
@@ -739,8 +738,11 @@ void ChatBackend::clearRecentChat()
 }
 
 
-void ChatBackend::applySettings(Settings* settings) {
-       m_recent_buffer.resize(settings->getU32("recent_chat_size"));
+void ChatBackend::applySettings()
+{
+       u32 recent_lines = g_settings->getU32("recent_chat_messages");
+       recent_lines = rangelim(recent_lines, 2, 20);
+       m_recent_buffer.resize(recent_lines);
 }
 
 void ChatBackend::step(float dtime)