summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-06 00:24:16 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-06 00:24:16 +0100
commitaa8b46e94714f261bfe451897b7ef23934e764eb (patch)
treea0a0e7bb1ef59f79a147260a2c8c73752203bf80 /src/Entities
parentAdded more chat functions (diff)
downloadcuberite-aa8b46e94714f261bfe451897b7ef23934e764eb.tar
cuberite-aa8b46e94714f261bfe451897b7ef23934e764eb.tar.gz
cuberite-aa8b46e94714f261bfe451897b7ef23934e764eb.tar.bz2
cuberite-aa8b46e94714f261bfe451897b7ef23934e764eb.tar.lz
cuberite-aa8b46e94714f261bfe451897b7ef23934e764eb.tar.xz
cuberite-aa8b46e94714f261bfe451897b7ef23934e764eb.tar.zst
cuberite-aa8b46e94714f261bfe451897b7ef23934e764eb.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Player.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index c0466fa66..385e28c28 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -132,9 +132,7 @@ cPlayer::~cPlayer(void)
{
if (!cRoot::Get()->GetPluginManager()->CallHookPlayerDestroyed(*this))
{
- AString DisconnectMessage;
- AppendPrintf(DisconnectMessage, "%s[LEAVE] %s%s has left the game", cChatColor::Yellow.c_str(), cChatColor::White.c_str(), GetName().c_str());
- cRoot::Get()->BroadcastChat(DisconnectMessage);
+ cRoot::Get()->BroadcastChatLeave(Printf("%s has left the game", GetName().c_str()));
LOGINFO("Player %s has left the game.", GetName().c_str());
}
@@ -847,18 +845,18 @@ void cPlayer::KilledBy(cEntity * a_Killer)
if (a_Killer == NULL)
{
- GetWorld()->BroadcastChat(Printf("%s[DEATH] %s%s was killed by environmental damage", cChatColor::Red.c_str(), cChatColor::White.c_str(), GetName().c_str()));
+ GetWorld()->BroadcastChatDeath(Printf("%s was killed by environmental damage", GetName().c_str()));
}
else if (a_Killer->IsPlayer())
{
- GetWorld()->BroadcastChat(Printf("%s[DEATH] %s%s was killed by %s", cChatColor::Red.c_str(), cChatColor::White.c_str(), GetName().c_str(), ((cPlayer *)a_Killer)->GetName().c_str()));
+ GetWorld()->BroadcastChatDeath(Printf("%s was killed by %s", GetName().c_str(), ((cPlayer *)a_Killer)->GetName().c_str()));
}
else
{
AString KillerClass = a_Killer->GetClass();
KillerClass.erase(KillerClass.begin()); // Erase the 'c' of the class (e.g. "cWitch" -> "Witch")
- GetWorld()->BroadcastChat(Printf("%s[DEATH] %s%s was killed by a %s", cChatColor::Red.c_str(), cChatColor::White.c_str(), GetName().c_str(), KillerClass.c_str()));
+ GetWorld()->BroadcastChatDeath(Printf("%s was killed by a %s", GetName().c_str(), KillerClass.c_str()));
}
class cIncrementCounterCB