diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-09-17 17:05:37 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-09-17 17:05:37 +0300 |
commit | 09bac4d98ec5d5c3a5603526e4dea5816a86c1e6 (patch) | |
tree | 4afd6f5e66af92f2b66211cf322079159e9a7d96 /src/net/tmwa | |
parent | f3db3708b082a885d39c38c42221f37b9c0e0d9d (diff) | |
download | manaplus-09bac4d98ec5d5c3a5603526e4dea5816a86c1e6.tar.gz manaplus-09bac4d98ec5d5c3a5603526e4dea5816a86c1e6.tar.bz2 manaplus-09bac4d98ec5d5c3a5603526e4dea5816a86c1e6.tar.xz manaplus-09bac4d98ec5d5c3a5603526e4dea5816a86c1e6.zip |
Remove ea/guildhandler and ea/guildrecv. Because guilds not works in legacy server anymore.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r-- | src/net/tmwa/generalhandler.cpp | 4 | ||||
-rw-r--r-- | src/net/tmwa/guildhandler.cpp | 11 | ||||
-rw-r--r-- | src/net/tmwa/guildhandler.h | 8 |
3 files changed, 16 insertions, 7 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 71030d748..bf919ce84 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -202,12 +202,8 @@ void GeneralHandler::gameStarted() const void GeneralHandler::gameEnded() const { if (socialWindow) - { - socialWindow->removeTab(Ea::taGuild); socialWindow->removeTab(Ea::taParty); - } - delete2(guildTab); delete2(partyTab); } diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index 0b3c03990..d3312c727 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -29,7 +29,7 @@ namespace TmwAthena { GuildHandler::GuildHandler() : - Ea::GuildHandler() + Net::GuildHandler() { guildHandler = this; } @@ -38,6 +38,15 @@ GuildHandler::~GuildHandler() { } +void GuildHandler::clear() const +{ +} + +ChatTab *GuildHandler::getTab() const +{ + return nullptr; +} + void GuildHandler::create(const std::string &name A_UNUSED) const { } diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index 16dc3c0df..ff5de76cb 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -22,12 +22,12 @@ #ifndef NET_TMWA_GUILDHANDLER_H #define NET_TMWA_GUILDHANDLER_H -#include "net/ea/guildhandler.h" +#include "net/guildhandler.h" namespace TmwAthena { -class GuildHandler final : public Ea::GuildHandler +class GuildHandler final : public Net::GuildHandler { public: GuildHandler(); @@ -36,6 +36,10 @@ class GuildHandler final : public Ea::GuildHandler ~GuildHandler(); + void clear() const override final; + + ChatTab *getTab() const override final; + void create(const std::string &name) const override final; void invite(const std::string &name) const override final; |