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

Merge remote-tracking branch 'origin/master' into c++11

Browse Source 
Conflicts:
	src/OSSupport/Thread.cpp
This commit is contained in:
Tiger Wang
2014-12-06 17:41:48 +00:00
parent ed99216ba4 3f23813412
commit 3acdf25b05
37 changed files with 695 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ClientHandle.cpp
View File

@@ -182,9 +182,13 @@ void cClientHandle::GenerateOfflineUUID(void)
AString cClientHandle::FormatChatPrefix(bool ShouldAppendChatPrefixes, AString a_ChatPrefixS, AString m_Color1, AString m_Color2)
{
if (ShouldAppendChatPrefixes)
{
return Printf("%s[%s] %s", m_Color1.c_str(), a_ChatPrefixS.c_str(), m_Color2.c_str());
}
else
{
return Printf("%s", m_Color1.c_str());
}
}