diff options
| author | Philipp Sehmisch <mana@crushnet.org> | 2010-02-24 19:28:36 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <mana@crushnet.org> | 2010-02-24 19:28:36 +0100 |
| commit | 48131e2ecfa4d52375d890dac80f9ab1ad45ccf0 (patch) | |
| tree | 0c973f354d827880cdab7a8bab8fa1357e9f97ec /src/net/ea/partyhandler.cpp | |
| parent | a5e26a9b9a8cab9feeaaa175aa4883913c3ff9d3 (diff) | |
| parent | f6d50d0cbe12f8799e6fec844816defc8711df37 (diff) | |
| download | mana-client-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.tar.gz mana-client-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.tar.bz2 mana-client-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.tar.xz mana-client-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src/net/ea/partyhandler.cpp')
| -rw-r--r-- | src/net/ea/partyhandler.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 157898dc..3e12e4b4 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -68,11 +68,8 @@ PartyHandler::PartyHandler(): PartyHandler::~PartyHandler() { - if (partyTab) - { - delete partyTab; - partyTab = 0; - } + delete partyTab; + partyTab = 0; } void PartyHandler::handleMessage(Net::MessageIn &msg) @@ -104,10 +101,9 @@ void PartyHandler::handleMessage(Net::MessageIn &msg) bool leader = msg.readInt8() == 0; bool online = msg.readInt8() == 0; - PartyMember *member = new PartyMember(PARTY_ID, id, nick); + PartyMember *member = eaParty->addMember(id, nick); member->setLeader(leader); member->setOnline(online); - eaParty->addMember(member); } } break; |