diff options
Diffstat (limited to 'src/party.cpp')
| -rw-r--r-- | src/party.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/party.cpp b/src/party.cpp index 155de2ba..e6d9167f 100644 --- a/src/party.cpp +++ b/src/party.cpp @@ -20,8 +20,9 @@ #include "party.h" -#include "beingmanager.h" -#include "player.h" +#include "actorspritemanager.h" + +#include "net/net.h" PartyMember::PartyMember(Party *party, int id, const std::string &name): Avatar(name), mId(id), mParty(party), mLeader(false) @@ -45,7 +46,7 @@ Party::~Party() PartyMember *Party::addMember(int id, const std::string &name) { PartyMember *m; - if ((m = getMember(id))) + if (Net::getNetworkType() == ServerInfo::TMWATHENA && (m = getMember(id))) { return m; } @@ -144,9 +145,9 @@ void Party::removeFromMembers() itr_end = mMembers.end(); while(itr != itr_end) { - Being *b = beingManager->findBeing((*itr)->getID()); - if (b && b->getType() == Being::PLAYER) - static_cast<Player*>(b)->setParty(NULL); + Being *b = actorSpriteManager->findBeing((*itr)->getID()); + if (b) + b->setParty(NULL); ++itr; } } |