flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Revert "Improved code"

Browse Source 
This reverts commit d8aa0b0ec7.
This commit is contained in:
Tiger Wang 2014-02-02 20:10:23 +00:00
parent f4c25ac445
commit 6ef5c057aa
4 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Log.cpp
View File

@ -134,15 +134,14 @@ void cLog::Log(const char * a_Format, va_list argList, bool a_ReplaceCurrentLine
__android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str() ); __android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str() );
//CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line ); //CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line );
#else #else
size_t LineLength = Line.length();
if (m_LastStringSize == 0)
m_LastStringSize = LineLength;
if (a_ReplaceCurrentLine) if (a_ReplaceCurrentLine)
{ {
#ifdef _WIN32 #ifdef _WIN32
if (LineLength < m_LastStringSize) // If last printed line was longer than current, clear this line 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) for (size_t X = 0; X != m_LastStringSize; ++X)
{ {
@ -163,9 +162,6 @@ void cLog::Log(const char * a_Format, va_list argList, bool a_ReplaceCurrentLine
{ {
printf("%s", Line.c_str()); printf("%s", Line.c_str());
} }
m_LastStringSize = LineLength;
#endif #endif
#if defined (_WIN32) && defined(_DEBUG) #if defined (_WIN32) && defined(_DEBUG)

12
src/MCLogger.cpp
View File

@ -11,10 +11,6 @@
cMCLogger * cMCLogger::s_MCLogger = NULL; cMCLogger * cMCLogger::s_MCLogger = NULL;
bool g_ShouldColorOutput = false; bool g_ShouldColorOutput = false;
/** Flag to show whether a 'replace line' log command has been issued
Used to decide when to put a newline */
bool g_BeginLineUpdate = false;
#ifdef _WIN32 #ifdef _WIN32
#include <io.h> // Needed for _isatty(), not available on Linux #include <io.h> // Needed for _isatty(), not available on Linux
@ -127,14 +123,14 @@ void cMCLogger::Log(const char * a_Format, va_list a_ArgList, bool a_ShouldRepla
{ {
cCSLock Lock(m_CriticalSection); cCSLock Lock(m_CriticalSection);
if (!g_BeginLineUpdate && a_ShouldReplaceLine) if (!m_BeginLineUpdate && a_ShouldReplaceLine)
{ {
a_ShouldReplaceLine = false; // Print a normal line first if this is the initial replace line a_ShouldReplaceLine = false; // Print a normal line first if this is the initial replace line
g_BeginLineUpdate = true; m_BeginLineUpdate = true;
} }
else if (g_BeginLineUpdate && !a_ShouldReplaceLine) else if (m_BeginLineUpdate && !a_ShouldReplaceLine)
{ {
g_BeginLineUpdate = false; m_BeginLineUpdate = false;
} }
if (a_ShouldReplaceLine) if (a_ShouldReplaceLine)

4
src/MCLogger.h
View File

@ -51,6 +51,10 @@ private:
/// Common initialization for all constructors, creates a logfile with the specified name and assigns s_MCLogger to this /// Common initialization for all constructors, creates a logfile with the specified name and assigns s_MCLogger to this
void InitLog(const AString & a_FileName); void InitLog(const AString & a_FileName);
/** Flag to show whether a 'replace line' log command has been issued
Used to decide when to put a newline */
bool m_BeginLineUpdate = false;
}; // tolua_export }; // tolua_export

2
src/World.cpp
View File

@ -111,7 +111,6 @@ protected:
cSleep::MilliSleep(100); cSleep::MilliSleep(100);
if (m_ShouldTerminate) if (m_ShouldTerminate)
{ {
LOGREPLACELINE("World successfully loaded!");
return; return;
} }
} }
@ -162,7 +161,6 @@ protected:
cSleep::MilliSleep(100); cSleep::MilliSleep(100);
if (m_ShouldTerminate) if (m_ShouldTerminate)
{ {
LOGREPLACELINE("Lighting successful!");
return; return;
} }
} }