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/manaserv/guildhandler.cpp | |
| parent | a5e26a9b9a8cab9feeaaa175aa4883913c3ff9d3 (diff) | |
| parent | f6d50d0cbe12f8799e6fec844816defc8711df37 (diff) | |
| download | mana-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.tar.gz mana-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.tar.bz2 mana-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.tar.xz mana-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src/net/manaserv/guildhandler.cpp')
| -rw-r--r-- | src/net/manaserv/guildhandler.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp index 0dfe8cde..253efb01 100644 --- a/src/net/manaserv/guildhandler.cpp +++ b/src/net/manaserv/guildhandler.cpp @@ -131,9 +131,8 @@ void GuildHandler::handleMessage(Net::MessageIn &msg) online = msg.readInt8(); if (name != "") { - member = new GuildMember(guildId, name); + member = guild->addMember(name); member->setOnline(online); - guild->addMember(member); } } } @@ -153,9 +152,8 @@ void GuildHandler::handleMessage(Net::MessageIn &msg) switch(eventId) { case GUILD_EVENT_NEW_PLAYER: - member = new GuildMember(guildId, name); + member = guild->addMember(name); member->setOnline(true); - guild->addMember(member); break; case GUILD_EVENT_LEAVING_PLAYER: @@ -296,7 +294,7 @@ void GuildHandler::leave(int guildId) chatServerConnection->send(msg); } -void GuildHandler::kick(GuildMember member) +void GuildHandler::kick(GuildMember *member, std::string reason) { // TODO } @@ -313,7 +311,7 @@ void GuildHandler::memberList(int guildId) chatServerConnection->send(msg); } -void GuildHandler::changeMemberPostion(GuildMember member, int level) +void GuildHandler::changeMemberPostion(GuildMember *member, int level) { /*MessageOut msg(PCMSG_GUILD_PROMOTE_MEMBER); msg.writeInt16(guildId); |