Merge branch 'master' of https://github.com/minetest/minetest

1 files changed, 12 insertions, 2 deletions

diff --git a/src/chat.h b/src/chat.h
index aabb0821e..fc080f64b 100644
--- a/src/chat.h
+++ b/src/chat.h
@@ -110,8 +110,13 @@ public:
 	void scrollAbsolute(s32 scroll);
 	// Scroll to bottom of buffer (newest)
 	void scrollBottom();
-	// Scroll to top of buffer (oldest)
-	void scrollTop();
+
+	// Functions for keeping track of whether the lines were modified by any
+	// preceding operations
+	// If they were not changed, getLineCount() and getLine() output the same as
+	// before
+	bool getLinesModified() const { return m_lines_modified; }
+	void resetLinesModified() { m_lines_modified = false; }
 
 	// Format a chat line for the given number of columns.
 	// Appends the formatted lines to the destination array and
@@ -146,6 +151,11 @@ private:
 	bool m_cache_clickable_chat_weblinks;
 	// Color of clickable chat weblinks
 	irr::video::SColor m_cache_chat_weblink_color;
+
+	// Whether the lines were modified since last markLinesUnchanged()
+	// Is always set to true when m_unformatted is modified, because that's what
+	// determines the output of getLineCount() and getLine()
+	bool m_lines_modified = true;
 };
 
 class ChatPrompt