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

Fixed attempts to call c_str on ChatColors

Browse Source
This commit is contained in:
archshift 2014-07-19 11:15:21 -07:00
parent d5b163bd3d
commit 52add840cf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ClientHandle.cpp
View File

@ -210,11 +210,11 @@ AString cClientHandle::FormatMessageType(bool ShouldAppendChatPrefixes, eMessage
{ {
if (ShouldAppendChatPrefixes) if (ShouldAppendChatPrefixes)
{ {
return Printf("%s[MSG: %s] %s%s", cChatColor::LightBlue.c_str(), a_AdditionalData.c_str(), cChatColor::White.c_str(), cChatColor::Italic.c_str()); return Printf("%s[MSG: %s] %s%s", cChatColor::LightBlue, a_AdditionalData.c_str(), cChatColor::White, cChatColor::Italic);
} }
else else
{ {
return Printf("%s: %s", a_AdditionalData.c_str(), cChatColor::LightBlue.c_str()); return Printf("%s: %s", a_AdditionalData.c_str(), cChatColor::LightBlue);
} }
} }
} }
@ -533,9 +533,9 @@ void cClientHandle::HandlePing(void)
Printf(Reply, "%s%s%i%s%i", Printf(Reply, "%s%s%i%s%i",
Server.GetDescription().c_str(), Server.GetDescription().c_str(),
cChatColor::Delimiter.c_str(), cChatColor::Delimiter,
Server.GetNumPlayers(), Server.GetNumPlayers(),
cChatColor::Delimiter.c_str(), cChatColor::Delimiter,
Server.GetMaxPlayers() Server.GetMaxPlayers()
); );
Kick(Reply); Kick(Reply);

4
src/Protocol/ProtocolRecognizer.cpp
View File

@ -1021,9 +1021,9 @@ void cProtocolRecognizer::SendLengthlessServerPing(void)
// http://wiki.vg/wiki/index.php?title=Protocol&oldid=3099#Server_List_Ping_.280xFE.29 // http://wiki.vg/wiki/index.php?title=Protocol&oldid=3099#Server_List_Ping_.280xFE.29
Printf(Reply, "%s%s%i%s%i", Printf(Reply, "%s%s%i%s%i",
Server->GetDescription().c_str(), Server->GetDescription().c_str(),
cChatColor::Delimiter.c_str(), cChatColor::Delimiter,
Server->GetNumPlayers(), Server->GetNumPlayers(),
cChatColor::Delimiter.c_str(), cChatColor::Delimiter,
Server->GetMaxPlayers() Server->GetMaxPlayers()
); );
break; break;