summaryrefslogtreecommitdiff
path: root/src/net/manaserv/guildhandler.h
diff options
context:
space:
mode:
authorPhilipp Sehmisch <mana@crushnet.org>2010-02-24 19:28:36 +0100
committerPhilipp Sehmisch <mana@crushnet.org>2010-02-24 19:28:36 +0100
commit48131e2ecfa4d52375d890dac80f9ab1ad45ccf0 (patch)
tree0c973f354d827880cdab7a8bab8fa1357e9f97ec /src/net/manaserv/guildhandler.h
parenta5e26a9b9a8cab9feeaaa175aa4883913c3ff9d3 (diff)
parentf6d50d0cbe12f8799e6fec844816defc8711df37 (diff)
downloadmana-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/manaserv/guildhandler.h')
-rw-r--r--src/net/manaserv/guildhandler.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/manaserv/guildhandler.h b/src/net/manaserv/guildhandler.h
index 8fdd40a4..1b6d51b5 100644
--- a/src/net/manaserv/guildhandler.h
+++ b/src/net/manaserv/guildhandler.h
@@ -45,13 +45,13 @@ public:
void leave(int guildId);
- void kick(GuildMember member);
+ void kick(GuildMember *member, std::string reason = "");
void chat(int guildId, const std::string &text);
void memberList(int guildId);
- void changeMemberPostion(GuildMember member, int level);
+ void changeMemberPostion(GuildMember *member, int level);
void requestAlliance(int guildId, int otherGuildId);