diff options
| author | Esteban I. RM <me@exio4.xyz> | 2017-10-15 21:22:22 -0300 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2017-10-17 19:22:09 +0200 |
| commit | 792e013eaf4a572364457b96f6f9c07dafe6fe9a (patch) | |
| tree | 124e08c9e3cc4704cd2a9ea49803fce96b046275 /src/chat.cpp | |
| parent | 93d185ee5d481c007d7b5569d046471dc60d40b6 (diff) | |
| download | minetest-792e013eaf4a572364457b96f6f9c07dafe6fe9a.tar.gz minetest-792e013eaf4a572364457b96f6f9c07dafe6fe9a.tar.bz2 minetest-792e013eaf4a572364457b96f6f9c07dafe6fe9a.zip | |
don't pass g_settings around, and use it directly
Diffstat (limited to 'src/chat.cpp')
| -rw-r--r-- | src/chat.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/chat.cpp b/src/chat.cpp index 967e159f8..a5d82a649 100644 --- 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) |