1 files changed, 29 insertions, 2 deletions

diff --git a/src/Log.cpp b/src/Log.cpp
index 2d6be0f59..a23a79ccc 100644
--- a/src/Log.cpp
+++ b/src/Log.cpp
@@ -99,7 +99,7 @@ void cLog::ClearLog()
 
 
 
-void cLog::Log(const char * a_Format, va_list argList)
+void cLog::Log(const char * a_Format, va_list argList, bool a_ReplaceCurrentLine)
 {
 	AString Message;
 	AppendVPrintf(Message, a_Format, argList);
@@ -134,7 +134,34 @@ void cLog::Log(const char * a_Format, va_list argList)
 	__android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str() );
 	//CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line );
 #else
-	printf("%s", Line.c_str());
+	if (a_ReplaceCurrentLine)
+	{
+#ifdef _WIN32
+		if (m_LastStringSize == 0)
+		{
+			m_LastStringSize = Line.length();
+		}
+		else if (Line.length() < m_LastStringSize) // If last printed line was longer than current, clear this line
+		{
+			for (size_t X = 0; X != m_LastStringSize; ++X)
+			{
+				fputs(" ", stdout);
+			}
+		}
+#else // _WIN32
+		fputs("\033[K", stdout); // Clear current line
+#endif
+
+		printf("\r%s", Line.c_str());
+
+#ifdef __linux
+		fputs("\033[1B", stdout); // Move down one line
+#endif // __linux
+	}
+	else
+	{
+		printf("%s", Line.c_str());
+	}
 #endif
 
 	#if defined (_WIN32) && defined(_DEBUG)