diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-12-02 07:12:57 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-12-02 07:13:37 -0700 |
| commit | d12c93d4d6fc38eb86b5cb8515f4b8f8a7e96b54 (patch) | |
| tree | c5fa5507e4766bef7bf09e20e17d3294fdd6d6e5 /src/net | |
| parent | b3c59dafe02c5c060bb1d8de7040b3a3ee73da44 (diff) | |
| download | mana-d12c93d4d6fc38eb86b5cb8515f4b8f8a7e96b54.tar.gz mana-d12c93d4d6fc38eb86b5cb8515f4b8f8a7e96b54.tar.bz2 mana-d12c93d4d6fc38eb86b5cb8515f4b8f8a7e96b54.tar.xz mana-d12c93d4d6fc38eb86b5cb8515f4b8f8a7e96b54.zip | |
Simplify PartyMember by moving fields into Avatar
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/partyhandler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 8a958845..1ede1b8d 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -483,7 +483,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) { PartyMember *member = partyWindow->findMember(id); - if (member && member->online) + if (member && member->getAvatar()->getOnline()) { player->setInParty(true); } diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 0865f71c..21d63ae5 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -268,7 +268,7 @@ void PartyHandler::handleMessage(Net::MessageIn &msg) PartyMember *member = partyWindow->findMember(id); if (member) - partyTab->chatLog(member->name, chatMsg); + partyTab->chatLog(member->getAvatar()->getName(), chatMsg); else partyTab->chatLog(strprintf(_("An unknown member tried to " "say: %s"), chatMsg.c_str()), BY_SERVER); |