1 files changed, 11 insertions, 40 deletions

diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp
index 14d9eb6b..8b6e6255 100644
--- a/src/playerrelations.cpp
+++ b/src/playerrelations.cpp
@@ -21,11 +21,10 @@
 
 #include <algorithm>
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
 #include "configuration.h"
 #include "graphics.h"
-#include "player.h"
 #include "playerrelations.h"
 
 #include "utils/dtor.h"
@@ -38,8 +37,6 @@
 #define NAME "name" // constant for xml serialisation
 #define RELATION "relation" // constant for xml serialisation
 
-#define IGNORE_EMOTE_TIME 100
-
 // (De)serialisation class
 class PlayerConfSerialiser : public ConfigurationListManager<std::pair<std::string, PlayerRelation *>,
                                                              std::map<std::string, PlayerRelation *> *>
@@ -214,7 +211,7 @@ unsigned int PlayerRelationsManager::checkPermissionSilently(const std::string &
 
 bool PlayerRelationsManager::hasPermission(Being *being, unsigned int flags)
 {
-    if (being->getType() == Being::PLAYER)
+    if (being->getType() == ActorSprite::PLAYER)
         return hasPermission(being->getName(), flags) == flags;
     return true;
 }
@@ -230,9 +227,10 @@ bool PlayerRelationsManager::hasPermission(const std::string &name,
         // execute `ignore' strategy, if possible
         if (mIgnoreStrategy)
         {
-            Being *b = beingManager->findBeingByName(name, Being::PLAYER);
-            if (b && b->getType() == Being::PLAYER)
-                mIgnoreStrategy->ignore(static_cast<Player *>(b), rejections);
+            Being *b = actorSpriteManager->findBeingByName(name,
+                                                        ActorSprite::PLAYER);
+            if (b && b->getType() == ActorSprite::PLAYER)
+                mIgnoreStrategy->ignore(b, rejections);
         }
     }
 
@@ -313,7 +311,7 @@ public:
         mShortName = PLAYER_IGNORE_STRATEGY_NOP;
     }
 
-    virtual void ignore(Player *player, unsigned int flags)
+    virtual void ignore(Being *being, unsigned int flags)
     {
     }
 };
@@ -327,9 +325,9 @@ public:
         mShortName = "dotdotdot";
     }
 
-    virtual void ignore(Player *player, unsigned int flags)
+    virtual void ignore(Being *being, unsigned int flags)
      {
-         player->setSpeech("...", 500);
+         being->setSpeech("...", 500);
      }
 };
 
@@ -343,44 +341,17 @@ public:
         mShortName = "blinkname";
     }
 
-    virtual void ignore(Player *player, unsigned int flags)
-    {
-        player->flashName(200);
-    }
-};
-
-class PIS_emote : public PlayerIgnoreStrategy
-{
-public:
-    PIS_emote(int emote_nr, const std::string &description, const std::string &shortname) :
-        mEmotion(emote_nr)
+    virtual void ignore(Being *being, unsigned int flags)
     {
-        mDescription = description;
-        mShortName = shortname;
+        being->flashName(200);
     }
-
-    virtual void ignore(Player *player, unsigned int flags)
-     {
-         player->setEmote(mEmotion, IGNORE_EMOTE_TIME);
-     }
-private:
-    int mEmotion;
 };
 
-
-
 std::vector<PlayerIgnoreStrategy *> *
 PlayerRelationsManager::getPlayerIgnoreStrategies()
 {
     if (mIgnoreStrategies.size() == 0)
     {
-        // not initialised yet?
-        mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE,
-                                                  _("Floating '...' bubble"),
-                                                   PLAYER_IGNORE_STRATEGY_EMOTE0));
-        mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE + 1,
-                                                  _("Floating bubble"),
-                                                  "emote1"));
         mIgnoreStrategies.push_back(new PIS_nothing());
         mIgnoreStrategies.push_back(new PIS_dotdotdot());
         mIgnoreStrategies.push_back(new PIS_blinkname());