1 files changed, 20 insertions, 26 deletions

diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 611fe3e6..00b1e621 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -20,7 +20,8 @@
 
 #include "net/tmwa/partyhandler.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
+#include "event.h"
 #include "localplayer.h"
 #include "log.h"
 
@@ -78,12 +79,9 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
     {
         case SMSG_PARTY_CREATE:
             if (msg.readInt8())
-                localChatTab->chatLog(_("Could not create party."), BY_SERVER);
+                SERVER_NOTICE(_("Could not create party."))
             else
-            {
-                localChatTab->chatLog(_("Party successfully created."),
-                                      BY_SERVER);
-            }
+                SERVER_NOTICE(_("Party successfully created."))
             break;
         case SMSG_PARTY_INFO:
             {
@@ -143,12 +141,9 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
                 std::string nick = "";
                 Being *being;
 
-                if ((being = beingManager->findBeing(id)))
+                if ((being = actorSpriteManager->findBeing(id)))
                 {
-                    if (being->getType() == Being::PLAYER)
-                    {
-                        nick = being->getName();
-                    }
+                    nick = being->getName();
                 }
 
                 socialWindow->showPartyInvite(partyName, nick);
@@ -238,8 +233,7 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
                 {
                     taParty->removeFromMembers();
                     taParty->clearMembers();
-                    localChatTab->chatLog(_("You have left the party."),
-                                          BY_SERVER);
+                    SERVER_NOTICE(_("You have left the party."))
                     if (partyTab)
                     {
                         delete partyTab;
@@ -252,9 +246,10 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
                     partyTab->chatLog(strprintf(_("%s has left your party."),
                                     nick.c_str()), BY_SERVER);
 
-                    Being *b = beingManager->findBeing(id);
-                    if (b && b->getType() == Being::PLAYER)
-                        static_cast<Player*>(b)->setParty(NULL);
+                    if (Being *b = actorSpriteManager->findBeing(id))
+                    {
+                        b->setParty(NULL);
+                    }
 
                     taParty->removeMember(id);
                 }
@@ -274,9 +269,9 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
 
                 // The server only sends this when the member is in range, so
                 // lets make sure they get the party hilight.
-                if (Being *b = beingManager->findBeing(id))
+                if (Being *b = actorSpriteManager->findBeing(id))
                 {
-                    static_cast<Player*>(b)->setParty(taParty);
+                    b->setParty(taParty);
                 }
             }
             break;
@@ -319,19 +314,19 @@ void PartyHandler::join(int partyId)
     // TODO?
 }
 
-void PartyHandler::invite(Player *player)
+void PartyHandler::invite(Being *being)
 {
     MessageOut outMsg(CMSG_PARTY_INVITE);
-    outMsg.writeInt32(player->getId());
+    outMsg.writeInt32(being->getId());
 }
 
 void PartyHandler::invite(const std::string &name)
 {
-    Being *invitee = beingManager->findBeingByName(name, Being::PLAYER);
+    Being *invitee = actorSpriteManager->findBeingByName(name, Being::PLAYER);
 
     if (invitee)
     {
-        invite((Player *)invitee);
+        invite(invitee);
         partyTab->chatLog(strprintf(_("Invited user %s to party."),
                                     invitee->getName().c_str()), BY_SERVER);
     }
@@ -342,8 +337,7 @@ void PartyHandler::invite(const std::string &name)
     }
     else
     {
-        localChatTab->chatLog(_("You can only inivte when you are in a party!"),
-                              BY_SERVER);
+        SERVER_NOTICE(_("You can only inivte when you are in a party!"))
     }
 }
 
@@ -359,10 +353,10 @@ void PartyHandler::leave()
     MessageOut outMsg(CMSG_PARTY_LEAVE);
 }
 
-void PartyHandler::kick(Player *player)
+void PartyHandler::kick(Being *being)
 {
     MessageOut outMsg(CMSG_PARTY_KICK);
-    outMsg.writeInt32(player->getId());
+    outMsg.writeInt32(being->getId());
     outMsg.writeString("", 24); //Unused
 }