From e26b64efb9c6b79bbd5d9426af6887e83651e466 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 6 May 2011 19:37:58 +0300
Subject: Move attack filter arrays and methods from localplayer to
 actorspritemanager class.

---
 src/gui/socialwindow.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/gui/socialwindow.cpp')

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())
-- 
cgit v1.2.3-60-g2f50