diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
| commit | 5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch) | |
| tree | de739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/game-server/commandhandler.cpp | |
| parent | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff) | |
| parent | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff) | |
| download | manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2 manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/game-server/commandhandler.cpp')
| -rw-r--r-- | src/game-server/commandhandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp index 9c413ed8..dcdd8c6a 100644 --- a/src/game-server/commandhandler.cpp +++ b/src/game-server/commandhandler.cpp @@ -167,7 +167,7 @@ static CmdRef const cmdRef[] = "<setname>_<specialname>", &handleRechargeSpecial}, {"listspecials", "<character>", "Lists the specials of the character.", &handleListSpecials}, - {NULL, NULL, NULL, NULL} + {nullptr, nullptr, nullptr, nullptr} }; @@ -284,7 +284,7 @@ static void handleHelp(Entity *player, std::string &args) return; } // detailed description of single command - for (size_t j = 0; cmdRef[j].cmd != NULL; j++) + for (size_t j = 0; cmdRef[j].cmd != nullptr; j++) { if (cmdRef[j].cmd == args) { @@ -1803,7 +1803,7 @@ void CommandHandler::handleCommand(Entity *player, break; case PermissionManager::PMR_ALLOWED: // handle the command - for (size_t i = 0; cmdRef[i].cmd != NULL; i++) + for (size_t i = 0; cmdRef[i].cmd != nullptr; i++) { if (cmdRef[i].cmd == type) { |