diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-06-09 18:13:06 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-06-10 12:28:28 -0600 |
| commit | ccafb75577f9ea8f86243d26e80fb60e56af12d1 (patch) | |
| tree | fd8e0566118c217f0efa3c32b90d6f8870822233 /src/playerrelations.cpp | |
| parent | 35e024b85a5448cba235fa400f9412fd4e289ec0 (diff) | |
| download | mana-ccafb75577f9ea8f86243d26e80fb60e56af12d1.tar.gz mana-ccafb75577f9ea8f86243d26e80fb60e56af12d1.tar.bz2 mana-ccafb75577f9ea8f86243d26e80fb60e56af12d1.tar.xz mana-ccafb75577f9ea8f86243d26e80fb60e56af12d1.zip | |
Merge BeingManager and FloorItemManager as ActorSpriteManager
No need for two different classes to manage ActorSprites.
Reviewed-by: Chuck Miller
Diffstat (limited to 'src/playerrelations.cpp')
| -rw-r--r-- | src/playerrelations.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp index e8c015d1..77d3fddd 100644 --- a/src/playerrelations.cpp +++ b/src/playerrelations.cpp @@ -21,8 +21,8 @@ #include <algorithm> +#include "actorspritemanager.h" #include "being.h" -#include "beingmanager.h" #include "configuration.h" #include "graphics.h" #include "playerrelations.h" @@ -220,8 +220,8 @@ bool PlayerRelationsManager::hasPermission(const std::string &name, // execute `ignore' strategy, if possible if (mIgnoreStrategy) { - Being *b = beingManager->findBeingByName(name, - ActorSprite::PLAYER); + Being *b = actorSpriteManager->findBeingByName(name, + ActorSprite::PLAYER); if (b && b->getType() == ActorSprite::PLAYER) mIgnoreStrategy->ignore(b, rejections); } |