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_server.cpp | |
| parent | d7fdf7c940317aebcbbeeaf156469e1571e01498 (diff) | |
Fix commands and starting to use nullptr instead of NULL
Diffstat (limited to 'src/scripts/Commands/cs_server.cpp')
| -rw-r--r-- | src/scripts/Commands/cs_server.cpp | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/src/scripts/Commands/cs_server.cpp b/src/scripts/Commands/cs_server.cpp index 3501c6c2b2..dac175f171 100644 --- a/src/scripts/Commands/cs_server.cpp +++ b/src/scripts/Commands/cs_server.cpp @@ -30,29 +30,25 @@ public: static std::vector<ChatCommand> serverIdleRestartCommandTable = { { "cancel", SEC_ADMINISTRATOR, true, &HandleServerShutDownCancelCommand, "" }, - { "" , SEC_ADMINISTRATOR, true, &HandleServerIdleRestartCommand, "" }, - { NULL, 0, false, NULL, "" } + { "" , SEC_ADMINISTRATOR, true, &HandleServerIdleRestartCommand, "" } }; static std::vector<ChatCommand> serverIdleShutdownCommandTable = { { "cancel", SEC_ADMINISTRATOR, true, &HandleServerShutDownCancelCommand, "" }, - { "" , SEC_ADMINISTRATOR, true, &HandleServerIdleShutDownCommand, "" }, - { NULL, 0, false, NULL, "" } + { "" , SEC_ADMINISTRATOR, true, &HandleServerIdleShutDownCommand, "" } }; static std::vector<ChatCommand> serverRestartCommandTable = { { "cancel", SEC_ADMINISTRATOR, true, &HandleServerShutDownCancelCommand, "" }, - { "" , SEC_ADMINISTRATOR, true, &HandleServerRestartCommand, "" }, - { NULL, 0, false, NULL, "" } + { "" , SEC_ADMINISTRATOR, true, &HandleServerRestartCommand, "" } }; static std::vector<ChatCommand> serverShutdownCommandTable = { { "cancel", SEC_ADMINISTRATOR, true, &HandleServerShutDownCancelCommand, "" }, - { "" , SEC_ADMINISTRATOR, true, &HandleServerShutDownCommand, "" }, - { NULL, 0, false, NULL, "" } + { "" , SEC_ADMINISTRATOR, true, &HandleServerShutDownCommand, "" } }; static std::vector<ChatCommand> serverSetCommandTable = @@ -61,29 +57,26 @@ public: { "loglevel", SEC_CONSOLE, true, &HandleServerSetLogLevelCommand, "" }, { "logfilelevel", SEC_CONSOLE, true, &HandleServerSetLogFileLevelCommand, "" }, { "motd", SEC_ADMINISTRATOR, true, &HandleServerSetMotdCommand, "" }, - { "closed", SEC_ADMINISTRATOR, true, &HandleServerSetClosedCommand, "" }, - { NULL, 0, false, NULL, "" } + { "closed", SEC_ADMINISTRATOR, true, &HandleServerSetClosedCommand, "" } }; static std::vector<ChatCommand> serverCommandTable = { { "corpses", SEC_GAMEMASTER, true, &HandleServerCorpsesCommand, "" }, { "exit", SEC_CONSOLE, true, &HandleServerExitCommand, "" }, - { "idlerestart", SEC_ADMINISTRATOR, true, NULL, "", serverIdleRestartCommandTable }, - { "idleshutdown", SEC_ADMINISTRATOR, true, NULL, "", serverIdleShutdownCommandTable }, + { "idlerestart", SEC_ADMINISTRATOR, true, nullptr, "", serverIdleRestartCommandTable }, + { "idleshutdown", SEC_ADMINISTRATOR, true, nullptr, "", serverIdleShutdownCommandTable }, { "info", SEC_PLAYER, true, &HandleServerInfoCommand, "" }, { "motd", SEC_PLAYER, true, &HandleServerMotdCommand, "" }, - { "restart", SEC_ADMINISTRATOR, true, NULL, "", serverRestartCommandTable }, - { "shutdown", SEC_ADMINISTRATOR, true, NULL, "", serverShutdownCommandTable }, - { "set", SEC_ADMINISTRATOR, true, NULL, "", serverSetCommandTable }, - { "togglequerylog", SEC_CONSOLE, true, &HandleServerToggleQueryLogging, "" }, - { NULL, 0, false, NULL, "" } + { "restart", SEC_ADMINISTRATOR, true, nullptr, "", serverRestartCommandTable }, + { "shutdown", SEC_ADMINISTRATOR, true, nullptr, "", serverShutdownCommandTable }, + { "set", SEC_ADMINISTRATOR, true, nullptr, "", serverSetCommandTable }, + { "togglequerylog", SEC_CONSOLE, true, &HandleServerToggleQueryLogging, "" } }; static std::vector<ChatCommand> commandTable = { - { "server", SEC_ADMINISTRATOR, true, NULL, "", serverCommandTable }, - { NULL, 0, false, NULL, "" } + { "server", SEC_ADMINISTRATOR, true, nullptr, "", serverCommandTable } }; return commandTable; } @@ -146,7 +139,7 @@ public: return false; char* timeStr = strtok((char*) args, " "); - char* exitCodeStr = strtok(NULL, ""); + char* exitCodeStr = strtok(nullptr, ""); int32 time = atoi(timeStr); @@ -182,7 +175,7 @@ public: return false; char* timeStr = strtok((char*) args, " "); - char* exitCodeStr = strtok(NULL, ""); + char* exitCodeStr = strtok(nullptr, ""); int32 time = atoi(timeStr); @@ -218,7 +211,7 @@ public: return false; char* timeStr = strtok((char*) args, " "); - char* exitCodeStr = strtok(NULL, ""); + char* exitCodeStr = strtok(nullptr, ""); int32 time = atoi(timeStr); @@ -253,7 +246,7 @@ public: return false; char* timeStr = strtok((char*) args, " "); - char* exitCodeStr = strtok(NULL, ""); + char* exitCodeStr = strtok(nullptr, ""); int32 time = atoi(timeStr); |