diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-10-12 18:54:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-10-12 18:54:54 +0300 |
| commit | 563bb83f0e5380b6be9819456246f0f2901f186c (patch) | |
| tree | d3afa8be8f6d11c6acc6eec5e274e2468a40617b /src | |
| parent | ff887f7a418b392431b6f2a0408d20cf1ee5cf07 (diff) | |
| download | manaplus-563bb83f0e5380b6be9819456246f0f2901f186c.tar.gz manaplus-563bb83f0e5380b6be9819456246f0f2901f186c.tar.bz2 manaplus-563bb83f0e5380b6be9819456246f0f2901f186c.tar.xz manaplus-563bb83f0e5380b6be9819456246f0f2901f186c.zip | |
Rename server feature haveChatChannels into haveSpecialChatChannels.
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/eathena/serverfeatures.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/serverfeatures.h | 2 | ||||
| -rw-r--r-- | src/net/serverfeatures.h | 2 | ||||
| -rw-r--r-- | src/net/tmwa/chathandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/serverfeatures.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/serverfeatures.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index f7bd1fe09..af25acc62 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -92,7 +92,7 @@ bool ServerFeatures::haveLookSelection() const return false; } -bool ServerFeatures::haveChatChannels() const +bool ServerFeatures::haveSpecialChatChannels() const { return false; } diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index 813e2e53e..a259a5df6 100644 --- a/src/net/eathena/serverfeatures.h +++ b/src/net/eathena/serverfeatures.h @@ -58,7 +58,7 @@ class ServerFeatures final : public Net::ServerFeatures bool haveLookSelection() const override final; - bool haveChatChannels() const override final; + bool haveSpecialChatChannels() const override final; bool haveServerIgnore() const override final; diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index c16d11f99..549ff7aa4 100644 --- a/src/net/serverfeatures.h +++ b/src/net/serverfeatures.h @@ -55,7 +55,7 @@ class ServerFeatures notfinal virtual bool haveLookSelection() const = 0; - virtual bool haveChatChannels() const = 0; + virtual bool haveSpecialChatChannels() const = 0; virtual bool haveServerIgnore() const = 0; diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index fde774670..051443318 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -126,7 +126,7 @@ void ChatHandler::talk(const std::string &restrict text, const std::string mes = std::string(localPlayer->getName()).append( " : ").append(text); - if (serverFeatures->haveChatChannels() && channel.size() == 3) + if (serverFeatures->haveSpecialChatChannels() && channel.size() == 3) { createOutPacket(CMSG_CHAT_MESSAGE2); // Added + 1 in order to let eAthena parse admin commands correctly diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index c94c093a4..b1556fbdf 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -94,7 +94,7 @@ bool ServerFeatures::haveLookSelection() const return serverVersion >= 9; } -bool ServerFeatures::haveChatChannels() const +bool ServerFeatures::haveSpecialChatChannels() const { return serverVersion >= 8; } diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index 97c42d1e4..8dc52bc15 100644 --- a/src/net/tmwa/serverfeatures.h +++ b/src/net/tmwa/serverfeatures.h @@ -58,7 +58,7 @@ class ServerFeatures final : public Net::ServerFeatures bool haveLookSelection() const override final; - bool haveChatChannels() const override final; + bool haveSpecialChatChannels() const override final; bool haveServerIgnore() const override final; |