summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-04-10 23:04:42 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-04-11 13:47:17 +0200
commitd7fa7ea64f6bb0bc0b097e4bf1ceb4bd9620d0da (patch)
tree1b4d200ba66c6afcdb7763951980476756339cf1 /src/common
parentaa04597c5f8bb806996d604699fc8ebff6d53bdd (diff)
downloadmanaserv-d7fa7ea64f6bb0bc0b097e4bf1ceb4bd9620d0da.tar.gz
manaserv-d7fa7ea64f6bb0bc0b097e4bf1ceb4bd9620d0da.tar.xz
manaserv-d7fa7ea64f6bb0bc0b097e4bf1ceb4bd9620d0da.zip
Converted Being into a Component
I did not really care too much about staying consistent with the use of static_casts to Actors since they are only temporary anyway until Actor is a component too.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/permissionmanager.cpp6
-rw-r--r--src/common/permissionmanager.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/common/permissionmanager.cpp b/src/common/permissionmanager.cpp
index ee970bd..c5c87f6 100644
--- a/src/common/permissionmanager.cpp
+++ b/src/common/permissionmanager.cpp
@@ -105,7 +105,7 @@ void PermissionManager::reload()
}
-PermissionManager::Result PermissionManager::checkPermission(const Being* character, std::string permission)
+PermissionManager::Result PermissionManager::checkPermission(const Entity* character, std::string permission)
{
return checkPermission(character->getComponent<CharacterComponent>()
->getAccountLevel(), permission);
@@ -140,7 +140,7 @@ unsigned char PermissionManager::getMaskFromAlias(const std::string &alias)
}
}
-std::list<std::string> PermissionManager::getPermissionList(const Being* character)
+std::list<std::string> PermissionManager::getPermissionList(const Entity* character)
{
std::list<std::string> result;
std::map<std::string, unsigned char>::iterator i;
@@ -159,7 +159,7 @@ std::list<std::string> PermissionManager::getPermissionList(const Being* charact
return result;
}
-std::list<std::string> PermissionManager::getClassList(const Being* character)
+std::list<std::string> PermissionManager::getClassList(const Entity* character)
{
std::list<std::string> result;
std::map<std::string, unsigned char>::iterator i;
diff --git a/src/common/permissionmanager.h b/src/common/permissionmanager.h
index a78f581..2189f89 100644
--- a/src/common/permissionmanager.h
+++ b/src/common/permissionmanager.h
@@ -25,7 +25,7 @@
#include <map>
#include <string>
-class Being;
+class Entity;
namespace PermissionManager
{
@@ -48,7 +48,7 @@ namespace PermissionManager
/**
* Returns if the characters account has the given permission
*/
- Result checkPermission(const Being* character, std::string permission);
+ Result checkPermission(const Entity *character, std::string permission);
Result checkPermission(unsigned char level, std::string permission);
/**
@@ -59,12 +59,12 @@ namespace PermissionManager
/**
* Gets a list of all permissions the character is having
*/
- std::list<std::string> getPermissionList(const Being* character);
+ std::list<std::string> getPermissionList(const Entity* character);
/**
* Gets a list of all permissions classes the character is having
*/
- std::list<std::string> getClassList(const Being* character);
+ std::list<std::string> getClassList(const Entity* character);
} // namespace PermissionManager