summaryrefslogtreecommitdiff
path: root/src/scripts/Commands/cs_guild.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/scripts/Commands/cs_guild.cpp')
-rw-r--r--src/scripts/Commands/cs_guild.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/scripts/Commands/cs_guild.cpp b/src/scripts/Commands/cs_guild.cpp
index ad37a9bfc2..f8ae16d58b 100644
--- a/src/scripts/Commands/cs_guild.cpp
+++ b/src/scripts/Commands/cs_guild.cpp
@@ -31,13 +31,11 @@ public:
{ "delete", SEC_GAMEMASTER, true, &HandleGuildDeleteCommand, "" },
{ "invite", SEC_GAMEMASTER, true, &HandleGuildInviteCommand, "" },
{ "uninvite", SEC_GAMEMASTER, true, &HandleGuildUninviteCommand, "" },
- { "rank", SEC_GAMEMASTER, true, &HandleGuildRankCommand, "" },
- { NULL, 0, false, NULL, "" }
+ { "rank", SEC_GAMEMASTER, true, &HandleGuildRankCommand, "" }
};
static std::vector<ChatCommand> commandTable =
{
- { "guild", SEC_ADMINISTRATOR, true, NULL, "", guildCommandTable },
- { NULL, 0, false, NULL, "" }
+ { "guild", SEC_ADMINISTRATOR, true, nullptr, "", guildCommandTable }
};
return commandTable;
}
@@ -57,10 +55,10 @@ public:
// if not guild name only (in "") then player name
Player* target;
- if (!handler->extractPlayerTarget(*args != '"' ? (char*)args : NULL, &target))
+ if (!handler->extractPlayerTarget(*args != '"' ? (char*)args : nullptr, &target))
return false;
- char* tailStr = *args != '"' ? strtok(NULL, "") : (char*)args;
+ char* tailStr = *args != '"' ? strtok(nullptr, "") : (char*)args;
if (!tailStr)
return false;
@@ -118,10 +116,10 @@ public:
// if not guild name only (in "") then player name
uint64 targetGuid;
- if (!handler->extractPlayerTarget(*args != '"' ? (char*)args : NULL, NULL, &targetGuid))
+ if (!handler->extractPlayerTarget(*args != '"' ? (char*)args : nullptr, nullptr, &targetGuid))
return false;
- char* tailStr = *args != '"' ? strtok(NULL, "") : (char*)args;
+ char* tailStr = *args != '"' ? strtok(nullptr, "") : (char*)args;
if (!tailStr)
return false;