diff options
| -rw-r--r-- | src/net/ea/guildhandler.cpp | 6 | ||||
| -rw-r--r-- | src/net/ea/guildhandler.h | 3 | ||||
| -rw-r--r-- | src/net/eathena/guildhandler.cpp | 8 | ||||
| -rw-r--r-- | src/net/eathena/guildhandler.h | 3 | ||||
| -rw-r--r-- | src/net/guildhandler.h | 5 | ||||
| -rw-r--r-- | src/net/tmwa/guildhandler.cpp | 5 | ||||
| -rw-r--r-- | src/net/tmwa/guildhandler.h | 2 |
7 files changed, 20 insertions, 12 deletions
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 020897193..6dbcb202a 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -60,12 +60,6 @@ GuildHandler::~GuildHandler() delete2(guildTab); } -void GuildHandler::requestAllianceResponse(const int guildId A_UNUSED, - const int otherGuildId A_UNUSED, - const bool response A_UNUSED) const -{ -} - void GuildHandler::endAlliance(const int guildId A_UNUSED, const int otherGuildId A_UNUSED) const { diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h index 6a8b78fbd..2defc0072 100644 --- a/src/net/ea/guildhandler.h +++ b/src/net/ea/guildhandler.h @@ -42,9 +42,6 @@ class GuildHandler notfinal : public Net::GuildHandler virtual ~GuildHandler(); - void requestAllianceResponse(const int guildId, const int otherGuildId, - const bool response) const override final; - void endAlliance(const int guildId, const int otherGuildId) const override final; diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index 609ae9182..76b7b0450 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -461,4 +461,12 @@ void GuildHandler::requestAlliance(const Being *const being) const outMsg.writeInt32(0, "inviter char id"); } +void GuildHandler::requestAllianceResponse(const int beingId, + const bool accept) const +{ + createOutPacket(CMSG_GUILD_ALLIANCE_REPLY); + outMsg.writeInt32(beingId, "account id"); + outMsg.writeInt32(accept, "accept flag"); +} + } // namespace EAthena diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index c1678484f..3eac0136f 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -72,6 +72,9 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler void requestAlliance(const Being *const being) const override final; + void requestAllianceResponse(const int beingId, + const bool accept) const override final; + protected: static void processGuildUpdateCoords(Net::MessageIn &msg); diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h index 31c225e03..5c67cda15 100644 --- a/src/net/guildhandler.h +++ b/src/net/guildhandler.h @@ -63,9 +63,8 @@ class GuildHandler notfinal virtual void requestAlliance(const Being *const being) const = 0; - virtual void requestAllianceResponse(const int guildId, - int const otherGuildId, - const bool response) const = 0; + virtual void requestAllianceResponse(const int beingId, + const bool accept) const = 0; virtual void endAlliance(const int guildId, const int otherGuildId) const = 0; diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index cc3dd3c2f..5a6c5e4d5 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -425,4 +425,9 @@ void GuildHandler::requestAlliance(const Being *const being A_UNUSED) const { } +void GuildHandler::requestAllianceResponse(const int beingId A_UNUSED, + const bool accept A_UNUSED) const +{ +} + } // namespace TmwAthena diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index 1dbbd3d2e..f14a897b6 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -72,6 +72,8 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler void requestAlliance(const Being *const being) const override final; + void requestAllianceResponse(const int beingId, + const bool accept) const override final; protected: static void processGuildPositionInfo(Net::MessageIn &msg); |