diff options
author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-04-28 11:52:08 +0200 |
---|---|---|
committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-05-02 21:45:54 +0200 |
commit | 0261eb73e5588f5732aef5df753311d488c45d06 (patch) | |
tree | d641b0cad81ea58b8d8680b002197a4f592ef4a9 /src/game-server/commandhandler.cpp | |
parent | 23ccc8080a5283adce9f06909fc89b63d0e25452 (diff) | |
download | manaserv-0261eb73e5588f5732aef5df753311d488c45d06.tar.gz manaserv-0261eb73e5588f5732aef5df753311d488c45d06.tar.bz2 manaserv-0261eb73e5588f5732aef5df753311d488c45d06.tar.xz manaserv-0261eb73e5588f5732aef5df753311d488c45d06.zip |
Fixed a bunch of cppcheck warnings
Diffstat (limited to 'src/game-server/commandhandler.cpp')
-rw-r--r-- | src/game-server/commandhandler.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp index dcdd8c6a..4c210bf0 100644 --- a/src/game-server/commandhandler.cpp +++ b/src/game-server/commandhandler.cpp @@ -198,13 +198,11 @@ static std::string playerRights(Entity *ch) std::stringstream str; str << (unsigned)ch->getComponent<CharacterComponent>()->getAccountLevel(); str << " ( "; - std::list<std::string> classes = - PermissionManager::getClassList(ch); - for (std::list<std::string>::iterator i = classes.begin(); - i != classes.end(); - i++) + std::list<std::string> classes = PermissionManager::getClassList(ch); + + for (std::string &permission : classes) { - str << (*i) << " "; + str << permission << " "; } str << ")"; return str.str(); @@ -257,7 +255,7 @@ static std::string getArgument(std::string &args) } else { - argument = args.substr(0); + argument = args; args = std::string(); } return argument; @@ -269,12 +267,10 @@ static void handleHelp(Entity *player, std::string &args) { // short list of all commands say("=Available Commands=", player); - std::list<std::string> commands = PermissionManager::getPermissionList(player); - for (std::list<std::string>::iterator i = commands.begin(); - i != commands.end(); - i++) + for (std::string &command : + PermissionManager::getPermissionList(player)) { - say((*i), player); + say(command, player); } } else { // don't show help for commands the player may not use @@ -909,7 +905,7 @@ static void handleBan(Entity *player, std::string &args) // feedback for command user std::string otherName = other->getComponent<BeingComponent>()->getName(); std::string msg = "You've banned " + otherName + " for " + utils::toString(length) + " minutes"; - say(msg.c_str(), player); + say(msg, player); // log transaction msg = "User banned " + otherName + " for " + utils::toString(length) + " minutes"; accountHandler->sendTransaction(characterComponent->getDatabaseID(), @@ -1423,7 +1419,6 @@ static void handleCraft(Entity *player, std::string &args) std::stringstream errMsg; std::list<InventoryItem> recipe; Inventory playerInventory(player); - std::map<int, int> totalAmountOfItem; while (true) { |