diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-05-06 19:37:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-05-06 21:57:13 +0300 |
| commit | e26b64efb9c6b79bbd5d9426af6887e83651e466 (patch) | |
| tree | af915bda2a533558cfecaf363e331d59145e1224 /src/gui/socialwindow.cpp | |
| parent | 0f58a82314ca88b059674c98236f229358f6a80a (diff) | |
| download | plus-e26b64efb9c6b79bbd5d9426af6887e83651e466.tar.gz plus-e26b64efb9c6b79bbd5d9426af6887e83651e466.tar.bz2 plus-e26b64efb9c6b79bbd5d9426af6887e83651e466.tar.xz plus-e26b64efb9c6b79bbd5d9426af6887e83651e466.zip | |
Move attack filter arrays and methods from localplayer to actorspritemanager class.
Diffstat (limited to 'src/gui/socialwindow.cpp')
| -rw-r--r-- | src/gui/socialwindow.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 2276f60e0..e943d7286 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -803,12 +803,13 @@ public: void updateList() { - if (!socialWindow || !player_node) + if (!socialWindow || !player_node || !actorSpriteManager) return; std::vector<Avatar*> *avatars = mBeings->getMembers(); - std::list<std::string> mobs = player_node->getPriorityAttackMobs(); + std::list<std::string> mobs + = actorSpriteManager->getPriorityAttackMobs(); std::list<std::string>::iterator i = mobs.begin(); std::vector<Avatar*>::iterator ia = avatars->begin(); @@ -860,7 +861,7 @@ public: ava->setY(0); avatars->push_back(ava); - mobs = player_node->getAttackMobs(); + mobs = actorSpriteManager->getAttackMobs(); i = mobs.begin(); while (i != mobs.end()) @@ -895,7 +896,7 @@ public: ava->setY(0); avatars->push_back(ava); - mobs = player_node->getIgnoreAttackMobs(); + mobs = actorSpriteManager->getIgnoreAttackMobs(); i = mobs.begin(); while (i != mobs.end()) |