on_death: Fix callback number of pushed arguments (Fixes #6451)

[oweals/minetest.git] / src / chat.h

diff --git a/src/chat.h b/src/chat.h
index 11061fd39e1c0e5619ec9d4b59c2961a7fe1260a..38727c6680a4bcd7f71b456079f90838471fb8f9 100644 (file)
--- a/src/chat.h
+++ b/src/chat.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CHAT_HEADER
-#define CHAT_HEADER
+#pragma once
 
 #include <string>
 #include <vector>
@@ -32,21 +31,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 struct ChatLine
 {
        // age in seconds
-       f32 age;
+       f32 age = 0.0f;
        // name of sending player, or empty if sent by server
        EnrichedString name;
        // message text
        EnrichedString text;
 
-       ChatLine(std::wstring a_name, std::wstring a_text):
-               age(0.0),
+       ChatLine(const std::wstring &a_name, const std::wstring &a_text):
                name(a_name),
                text(a_text)
        {
        }
 
-       ChatLine(EnrichedString a_name, EnrichedString a_text):
-               age(0.0),
+       ChatLine(const EnrichedString &a_name, const EnrichedString &a_text):
                name(a_name),
                text(a_text)
        {
@@ -75,7 +72,7 @@ class ChatBuffer
 {
 public:
        ChatBuffer(u32 scrollback);
-       ~ChatBuffer();
+       ~ChatBuffer() = default;
 
        // Append chat line
        // Removes oldest chat line if scrollback size is reached
@@ -86,8 +83,6 @@ public:
 
        // Get number of lines currently in buffer.
        u32 getLineCount() const;
-       // Get scrollback size, maximum number of lines in buffer.
-       u32 getScrollback() const;
        // Get reference to i-th chat line.
        const ChatLine& getLine(u32 index) const;
 
@@ -134,11 +129,11 @@ private:
        std::vector<ChatLine> m_unformatted;
 
        // Number of character columns in console
-       u32 m_cols;
+       u32 m_cols = 0;
        // Number of character rows in console
-       u32 m_rows;
+       u32 m_rows = 0;
        // Scroll position (console's top line index into m_formatted)
-       s32 m_scroll;
+       s32 m_scroll = 0;
        // Array of formatted lines
        std::vector<ChatFormattedLine> m_formatted;
        // Empty formatted line, for error returns
@@ -148,8 +143,8 @@ private:
 class ChatPrompt
 {
 public:
-       ChatPrompt(std::wstring prompt, u32 history_limit);
-       ~ChatPrompt();
+       ChatPrompt(const std::wstring &prompt, u32 history_limit);
+       ~ChatPrompt() = default;
 
        // Input character or string
        void input(wchar_t ch);
@@ -162,8 +157,7 @@ public:
        std::wstring getLine() const { return m_line; }
 
        // Get section of line that is currently selected
-       std::wstring getSelection() const
-               { return m_line.substr(m_cursor, m_cursor_len); }
+       std::wstring getSelection() const { return m_line.substr(m_cursor, m_cursor_len); }
 
        // Clear the current line
        void clear();
@@ -228,36 +222,36 @@ protected:
 
 private:
        // Prompt prefix
-       std::wstring m_prompt;
+       std::wstring m_prompt = L"";
        // Currently edited line
-       std::wstring m_line;
+       std::wstring m_line = L"";
        // History buffer
        std::vector<std::wstring> m_history;
        // History index (0 <= m_history_index <= m_history.size())
-       u32 m_history_index;
+       u32 m_history_index = 0;
        // Maximum number of history entries
        u32 m_history_limit;
 
        // Number of columns excluding columns reserved for the prompt
-       s32 m_cols;
+       s32 m_cols = 0;
        // Start of visible portion (index into m_line)
-       s32 m_view;
+       s32 m_view = 0;
        // Cursor (index into m_line)
-       s32 m_cursor;
+       s32 m_cursor = 0;
        // Cursor length (length of selected portion of line)
-       s32 m_cursor_len;
+       s32 m_cursor_len = 0;
 
        // Last nick completion start (index into m_line)
-       s32 m_nick_completion_start;
+       s32 m_nick_completion_start = 0;
        // Last nick completion start (index into m_line)
-       s32 m_nick_completion_end;
+       s32 m_nick_completion_end = 0;
 };
 
 class ChatBackend
 {
 public:
        ChatBackend();
-       ~ChatBackend();
+       ~ChatBackend() = default;
 
        // Add chat message
        void addMessage(std::wstring name, std::wstring text);
@@ -292,6 +286,3 @@ private:
        ChatBuffer m_recent_buffer;
        ChatPrompt m_prompt;
 };
-
-#endif
-