Core/Commands: Reintroduce CONFIG_SHOW_KICK_IN_WORLD-handling after a long absensce in the 'commented out code'-world

Closes issue 4042.

--HG--
branch : trunk
This commit is contained in:
click
2010-11-23 19:49:48 +01:00
parent 825dcbec53
commit f18cbadf7f
+5 -5
View File
@@ -205,10 +205,10 @@ bool ChatHandler::HandleDeMorphCommand(const char* /*args*/)
//kick player //kick player
bool ChatHandler::HandleKickPlayerCommand(const char *args) bool ChatHandler::HandleKickPlayerCommand(const char *args)
{ {
/* const char* kickName = strtok((char*)args, " "); const char* kickName = strtok((char*)args, " ");
char* kickReason = strtok(NULL, "\n"); char* kickReason = strtok(NULL, "\n");
std::string reason = "No Reason"; std::string reason = "No reason given";
std::string kicker = "Console"; std::string kicker = "CONSOLE";
if (kickReason) if (kickReason)
reason = kickReason; reason = kickReason;
if (m_session) if (m_session)
@@ -282,7 +282,7 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args)
if (sWorld.KickPlayer(name)) if (sWorld.KickPlayer(name))
{ {
if (sWorld.getIntConfig(CONFIG_SHOW_KICK_IN_WORLD) == 1) if (sWorld.getBoolConfig(CONFIG_SHOW_KICK_IN_WORLD) == 1)
{ {
sWorld.SendWorldText(LANG_COMMAND_KICKMESSAGE, nameLink.c_str(), kicker.c_str(), reason.c_str()); sWorld.SendWorldText(LANG_COMMAND_KICKMESSAGE, nameLink.c_str(), kicker.c_str(), reason.c_str());
} }
@@ -296,7 +296,7 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args)
PSendSysMessage(LANG_COMMAND_KICKNOTFOUNDPLAYER,nameLink.c_str()); PSendSysMessage(LANG_COMMAND_KICKNOTFOUNDPLAYER,nameLink.c_str());
return false; return false;
} }
}*/ }
Player* target; Player* target;
if (!extractPlayerTarget((char*)args,&target)) if (!extractPlayerTarget((char*)args,&target))
return false; return false;