diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2016-08-20 09:49:37 +0200 |
|---|---|---|
| committer | Yehonal <yehonal.azeroth@gmail.com> | 2016-08-20 09:49:37 +0200 |
| commit | 1b1767e9f4c20d1e20541968de98d00814f63247 (patch) | |
| tree | ee95040cf29644aff151f9aebdf3bfd9e18ae08d /src/scripts/Commands/cs_guild.cpp | |
| parent | d7fdf7c940317aebcbbeeaf156469e1571e01498 (diff) | |
Fix commands and starting to use nullptr instead of NULL
Diffstat (limited to 'src/scripts/Commands/cs_guild.cpp')
| -rw-r--r-- | src/scripts/Commands/cs_guild.cpp | 14 |
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; |