diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-20 18:33:47 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-20 18:33:47 +0300 |
| commit | 66f1a82e7910404b812db255a99cb559d9ab3dcf (patch) | |
| tree | 97958e8d65b3f8c9fde397331e3b8c09433fe31b /src | |
| parent | e078b82b6b7fc6c19499287a7ebaafa8ce6a8fe8 (diff) | |
| download | manaplus-66f1a82e7910404b812db255a99cb559d9ab3dcf.tar.gz manaplus-66f1a82e7910404b812db255a99cb559d9ab3dcf.tar.bz2 manaplus-66f1a82e7910404b812db255a99cb559d9ab3dcf.tar.xz manaplus-66f1a82e7910404b812db255a99cb559d9ab3dcf.zip | |
Remove some useless server feature checks from tmwa.
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/tmwa/buysellhandler.cpp | 1 | ||||
| -rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 7 | ||||
| -rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/loginhandler.cpp | 5 | ||||
| -rw-r--r-- | src/net/tmwa/npchandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/tradehandler.cpp | 2 |
6 files changed, 2 insertions, 17 deletions
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index 0df127159..165f87b37 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -34,7 +34,6 @@ #include "gui/widgets/createwidget.h" #include "net/chathandler.h" -#include "net/serverfeatures.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 218f30333..7e0c2e988 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -267,12 +267,7 @@ void CharServerHandler::newCharacter(const std::string &name, const int slot, outMsg.writeInt8(static_cast<int8_t>(hairColor), "hair color"); outMsg.writeInt8(0, "unused"); outMsg.writeInt8(static_cast<int8_t>(hairstyle), "hair style"); - if (serverFeatures->haveLookSelection()) - outMsg.writeInt8(static_cast<int8_t>(look), "look"); - else - outMsg.writeInt8(0, "unused"); - if (serverFeatures->haveRaceSelection()) - outMsg.writeInt8(race, "class"); + outMsg.writeInt8(0, "unused"); } void CharServerHandler::deleteCharacter(Net::Character *const character, diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 633815ac7..cff6241f9 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -33,8 +33,6 @@ #include "listeners/arrowslistener.h" -#include "net/serverfeatures.h" - #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index f69151d9d..58a0be565 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -216,10 +216,7 @@ void LoginHandler::processServerVersion(Net::MessageIn &msg) int LoginHandler::supportedOptionalActions() const { - return serverFeatures->haveEmailOnRegister() - ? Net::RegistrationOptions::SetEmailOnRegister - | Net::RegistrationOptions::SetGenderOnRegister - : Net::RegistrationOptions::SetGenderOnRegister; + return Net::RegistrationOptions::SetGenderOnRegister; } void LoginHandler::sendVersion() const diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index efabfff2e..7007a20f1 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -28,8 +28,6 @@ #include "gui/widgets/createwidget.h" -#include "net/serverfeatures.h" - #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 8f9a110df..c169b5763 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -32,8 +32,6 @@ #include "gui/windows/tradewindow.h" -#include "net/serverfeatures.h" - #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" |