diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-03-29 14:51:02 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-03-29 14:51:02 +0300 |
| commit | d08e40706207d56cdeee73cab17f2ea61ab1082c (patch) | |
| tree | 4caa8862828d2c6dee2df1aa6fff8d2d92eea275 /src/net/eathena | |
| parent | 32bf758a1267689cac65e10f69c73b8efa40bb94 (diff) | |
| download | manaplus-d08e40706207d56cdeee73cab17f2ea61ab1082c.tar.gz manaplus-d08e40706207d56cdeee73cab17f2ea61ab1082c.tar.bz2 manaplus-d08e40706207d56cdeee73cab17f2ea61ab1082c.tar.xz manaplus-d08e40706207d56cdeee73cab17f2ea61ab1082c.zip | |
Remove unused guildid parameter from guild handler.
Diffstat (limited to 'src/net/eathena')
| -rw-r--r-- | src/net/eathena/guildhandler.cpp | 15 | ||||
| -rw-r--r-- | src/net/eathena/guildhandler.h | 13 |
2 files changed, 11 insertions, 17 deletions
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index 502ae1dc1..4fbf4ca58 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -231,8 +231,7 @@ void GuildHandler::create(const std::string &name) const outMsg.writeString(name, 24, "guild name"); } -void GuildHandler::invite(const int guildId A_UNUSED, - const std::string &name) const +void GuildHandler::invite(const std::string &name) const { if (!actorManager) return; @@ -248,8 +247,7 @@ void GuildHandler::invite(const int guildId A_UNUSED, } } -void GuildHandler::invite(const int guildId A_UNUSED, - const Being *const being) const +void GuildHandler::invite(const Being *const being) const { if (!being) return; @@ -295,8 +293,7 @@ void GuildHandler::kick(const GuildMember *restrict const member, outMsg.writeString(reason, 40, "message"); } -void GuildHandler::chat(const int guildId A_UNUSED, - const std::string &text) const +void GuildHandler::chat(const std::string &text) const { if (!localPlayer) return; @@ -309,7 +306,7 @@ void GuildHandler::chat(const int guildId A_UNUSED, outMsg.writeInt8(0, "zero byte"); } -void GuildHandler::memberList(const int guildId A_UNUSED) const +void GuildHandler::memberList() const { // 0 = basic info + alliance info // 1 = position name list + member list @@ -321,7 +318,7 @@ void GuildHandler::memberList(const int guildId A_UNUSED) const outMsg.writeInt32(1, "action"); // Request member list } -void GuildHandler::info(const int guildId A_UNUSED) +void GuildHandler::info() { // 0 = basic info + alliance info // 1 = position name list + member list @@ -387,7 +384,7 @@ void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg) guildTab->loadFromLogFile("#Guild"); if (localPlayer) localPlayer->addGuild(Ea::taGuild); - guildHandler->memberList(guildId); + guildHandler->memberList(); } if (localPlayer) diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index e390bf595..c4436fa98 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -42,11 +42,9 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler void create(const std::string &name) const override final; - void invite(const int guildId, - const std::string &name) const override final; + void invite(const std::string &name) const override final; - void invite(const int guildId, - const Being *const being) const override final; + void invite(const Being *const being) const override final; void inviteResponse(const int guildId, const bool response) const override final; @@ -56,12 +54,11 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler void kick(const GuildMember *restrict const member, const std::string &restrict reason) const override final; - void chat(const int guildId, - const std::string &text) const override final; + void chat(const std::string &text) const override final; - void memberList(const int guildId) const override final; + void memberList() const override final; - void info(const int guildId) override final; + void info() override final; void changeMemberPostion(const GuildMember *const member, const int level) const override final; |