diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/popups/popupmenu.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/serverfeatures.cpp | 5 | ||||
-rw-r--r-- | src/net/eathena/serverfeatures.h | 2 | ||||
-rw-r--r-- | src/net/serverfeatures.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/serverfeatures.cpp | 5 | ||||
-rw-r--r-- | src/net/tmwa/serverfeatures.h | 2 |
6 files changed, 1 insertions, 17 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 913ebdeba..450dcee1d 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -1013,7 +1013,7 @@ void PopupMenu::showChatPopup(const int x, const int y, ChatTab *const tab) } addPlayerMisc(); addBuySellDefault(); - if (serverFeatures->havePartyNickInvite()) + if (Net::getNetworkType() == ServerType::EATHENA) addParty(wTab->getNick()); mBrowserBox->addRow("##3---"); } diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index d787d0433..924a588d3 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -41,11 +41,6 @@ bool ServerFeatures::haveServerOnlineList() const return serverVersion > 0; } -bool ServerFeatures::havePartyNickInvite() const -{ - return true; -} - bool ServerFeatures::haveServerHp() const { return true; diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index 7b6f790fe..5d0da137e 100644 --- a/src/net/eathena/serverfeatures.h +++ b/src/net/eathena/serverfeatures.h @@ -36,8 +36,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveServerOnlineList() const override final; - bool havePartyNickInvite() const override final A_CONST; - bool haveServerHp() const override final A_CONST; bool havePlayerStatusUpdate() const override final; diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index 18cc10c42..2262f2dcc 100644 --- a/src/net/serverfeatures.h +++ b/src/net/serverfeatures.h @@ -38,8 +38,6 @@ class ServerFeatures notfinal virtual bool haveServerOnlineList() const = 0; - virtual bool havePartyNickInvite() const = 0; - virtual bool haveServerHp() const = 0; virtual bool havePlayerStatusUpdate() const = 0; diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index 40e51e30e..a413e2f19 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -39,11 +39,6 @@ bool ServerFeatures::haveServerOnlineList() const return false; } -bool ServerFeatures::havePartyNickInvite() const -{ - return false; -} - bool ServerFeatures::haveServerHp() const { return tmwServerVersion > 0x0f0513; diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index bdbaefd9d..1cd4feb2d 100644 --- a/src/net/tmwa/serverfeatures.h +++ b/src/net/tmwa/serverfeatures.h @@ -36,8 +36,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveServerOnlineList() const override final A_CONST; - bool havePartyNickInvite() const override final A_CONST; - bool haveServerHp() const override final; bool havePlayerStatusUpdate() const override final A_CONST; |