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/common | |
parent | 23ccc8080a5283adce9f06909fc89b63d0e25452 (diff) | |
download | manaserv-0261eb73e5588f5732aef5df753311d488c45d06.tar.gz manaserv-0261eb73e5588f5732aef5df753311d488c45d06.tar.xz manaserv-0261eb73e5588f5732aef5df753311d488c45d06.zip |
Fixed a bunch of cppcheck warnings
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/permissionmanager.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/common/permissionmanager.cpp b/src/common/permissionmanager.cpp index b1c93c1..bd1767a 100644 --- a/src/common/permissionmanager.cpp +++ b/src/common/permissionmanager.cpp @@ -143,16 +143,15 @@ unsigned char PermissionManager::getMaskFromAlias(const std::string &alias) std::list<std::string> PermissionManager::getPermissionList(const Entity* character) { std::list<std::string> result; - std::map<std::string, unsigned char>::iterator i; unsigned char mask = character->getComponent<CharacterComponent>() ->getAccountLevel(); - for (i = permissions.begin(); i != permissions.end(); i++) + for (auto &permissionIt : permissions) { - if (i->second & mask) + if (permissionIt.second & mask) { - result.push_back(i->first); + result.push_back(permissionIt.first); } } @@ -162,17 +161,14 @@ std::list<std::string> PermissionManager::getPermissionList(const Entity* charac std::list<std::string> PermissionManager::getClassList(const Entity* character) { std::list<std::string> result; - std::map<std::string, unsigned char>::iterator i; unsigned char mask = character->getComponent<CharacterComponent>() ->getAccountLevel(); - for (i = aliases.begin(); i != aliases.end(); i++) + for (auto &aliasIt : aliases) { - if (i->second & mask) - { - result.push_back(i->first); - } + if (aliasIt.second & mask) + result.push_back(aliasIt.first); } return result; |