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_go.cpp | |
| parent | d7fdf7c940317aebcbbeeaf156469e1571e01498 (diff) | |
Fix commands and starting to use nullptr instead of NULL
Diffstat (limited to 'src/scripts/Commands/cs_go.cpp')
| -rw-r--r-- | src/scripts/Commands/cs_go.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/scripts/Commands/cs_go.cpp b/src/scripts/Commands/cs_go.cpp index 3c84cb6598..352a177ea9 100644 --- a/src/scripts/Commands/cs_go.cpp +++ b/src/scripts/Commands/cs_go.cpp @@ -37,14 +37,12 @@ public: { "zonexy", SEC_GAMEMASTER, false, &HandleGoZoneXYCommand, "" }, { "xyz", SEC_GAMEMASTER, false, &HandleGoXYZCommand, "" }, { "ticket", SEC_GAMEMASTER, false, &HandleGoTicketCommand, "" }, - { "", SEC_GAMEMASTER, false, &HandleGoXYZCommand, "" }, - { NULL, 0, false, NULL, "" } + { "", SEC_GAMEMASTER, false, &HandleGoXYZCommand, "" } }; static std::vector<ChatCommand> commandTable = { - { "go", SEC_GAMEMASTER, false, NULL, "", goCommandTable }, - { NULL, 0, false, NULL, "" } + { "go", SEC_GAMEMASTER, false, nullptr, "", goCommandTable } }; return commandTable; } @@ -79,7 +77,7 @@ public: { // Get the "creature_template.entry" // number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r - char* tail = strtok(NULL, ""); + char* tail = strtok(nullptr, ""); if (!tail) return false; char* id = handler->extractKeyFromLink(tail, "Hcreature_entry"); @@ -210,8 +208,8 @@ public: Player* player = handler->GetSession()->GetPlayer(); char* gridX = strtok((char*)args, " "); - char* gridY = strtok(NULL, " "); - char* id = strtok(NULL, " "); + char* gridY = strtok(nullptr, " "); + char* id = strtok(nullptr, " "); if (!gridX || !gridY) return false; @@ -402,8 +400,8 @@ public: Player* player = handler->GetSession()->GetPlayer(); char* zoneX = strtok((char*)args, " "); - char* zoneY = strtok(NULL, " "); - char* tail = strtok(NULL, ""); + char* zoneY = strtok(nullptr, " "); + char* tail = strtok(nullptr, ""); char* id = handler->extractKeyFromLink(tail, "Harea"); // string or [name] Shift-click form |color|Harea:area_id|h[name]|h|r @@ -474,10 +472,10 @@ public: Player* player = handler->GetSession()->GetPlayer(); char* goX = strtok((char*)args, " "); - char* goY = strtok(NULL, " "); - char* goZ = strtok(NULL, " "); - char* id = strtok(NULL, " "); - char* port = strtok(NULL, " "); + char* goY = strtok(nullptr, " "); + char* goZ = strtok(nullptr, " "); + char* id = strtok(nullptr, " "); + char* port = strtok(nullptr, " "); if (!goX || !goY) return false; |