Fix commands and starting to use nullptr instead of NULL

This commit is contained in:
Yehonal
2016-08-20 09:49:37 +02:00
parent d7fdf7c940
commit 1b1767e9f4
32 changed files with 394 additions and 479 deletions

View File

@@ -39,22 +39,22 @@ public:
{ "queue", SEC_GAMEMASTER, false, &HandleLfgQueueInfoCommand, "" },
{ "clean", SEC_ADMINISTRATOR, false, &HandleLfgCleanCommand, "" },
{ "options", SEC_ADMINISTRATOR, false, &HandleLfgOptionsCommand, "" },
{ NULL, SEC_PLAYER, false, NULL, "" }
{ nullptr, SEC_PLAYER, false, nullptr, "" }
};
static std::vector<ChatCommand> commandTable =
{
{ "lfg", SEC_GAMEMASTER, false, NULL, "", lfgCommandTable },
{ NULL, SEC_PLAYER, false, NULL, "" }
{ "lfg", SEC_GAMEMASTER, false, nullptr, "", lfgCommandTable },
{ nullptr, SEC_PLAYER, false, nullptr, "" }
};
return commandTable;
}
static bool HandleLfgPlayerInfoCommand(ChatHandler* handler, char const* args)
{
Player* target = NULL;
Player* target = nullptr;
std::string playerName;
if (!handler->extractPlayerTarget((char*)args, &target, NULL, &playerName))
if (!handler->extractPlayerTarget((char*)args, &target, nullptr, &playerName))
return false;
GetPlayerInfo(handler, target);
@@ -63,9 +63,9 @@ public:
static bool HandleLfgGroupInfoCommand(ChatHandler* handler, char const* args)
{
Player* target = NULL;
Player* target = nullptr;
std::string playerName;
if (!handler->extractPlayerTarget((char*)args, &target, NULL, &playerName))
if (!handler->extractPlayerTarget((char*)args, &target, nullptr, &playerName))
return false;
Group* grp = target->GetGroup();
@@ -80,7 +80,7 @@ public:
handler->PSendSysMessage(LANG_LFG_GROUP_INFO, grp->isLFGGroup(),
state.c_str(), sLFGMgr->GetDungeon(guid));
for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
for (GroupReference* itr = grp->GetFirstMember(); itr != nullptr; itr = itr->next())
GetPlayerInfo(handler, itr->GetSource());
*/
return true;