summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/loginhandler.h5
-rw-r--r--src/net/eathena/loginhandler.cpp8
-rw-r--r--src/net/eathena/loginhandler.h2
-rw-r--r--src/net/loginhandler.h5
-rw-r--r--src/net/registrationoptions.h40
-rw-r--r--src/net/tmwa/loginhandler.cpp5
-rw-r--r--src/net/tmwa/loginhandler.h2
7 files changed, 0 insertions, 67 deletions
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index b4a36a4fa..fb9003473 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -25,8 +25,6 @@
#include "net/loginhandler.h"
-#include "net/registrationoptions.h"
-
class LoginData;
struct Token;
@@ -41,9 +39,6 @@ class LoginHandler notfinal : public Net::LoginHandler
virtual ~LoginHandler();
- int supportedOptionalActions() const override A_WARN_UNUSED
- { return Net::RegistrationOptions::SetGenderOnRegister; }
-
bool isRegistrationEnabled() const override final A_WARN_UNUSED;
void getRegistrationDetails() const override final;
diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp
index 71bf67245..a50b0dc4a 100644
--- a/src/net/eathena/loginhandler.cpp
+++ b/src/net/eathena/loginhandler.cpp
@@ -130,14 +130,6 @@ void LoginHandler::sendVersion() const
generalHandler->flushSend();
}
-int LoginHandler::supportedOptionalActions() const
-{
- return serverFeatures->haveEmailOnRegister()
- ? Net::RegistrationOptions::SetEmailOnRegister
- | Net::RegistrationOptions::SetGenderOnRegister
- : Net::RegistrationOptions::SetGenderOnRegister;
-}
-
void LoginHandler::ping() const
{
createOutPacket(CMSG_LOGIN_PING);
diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h
index b400c8dd5..990622450 100644
--- a/src/net/eathena/loginhandler.h
+++ b/src/net/eathena/loginhandler.h
@@ -54,8 +54,6 @@ class LoginHandler final : public Ea::LoginHandler
ServerInfo *getCharServer() const override final A_WARN_UNUSED;
- int supportedOptionalActions() const override final A_WARN_UNUSED;
-
void ping() const override final;
private:
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 47979ca65..47bf6e554 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -46,11 +46,6 @@ class LoginHandler notfinal
virtual void disconnect() = 0;
- /**
- * @see OptionalAction
- */
- virtual int supportedOptionalActions() const A_WARN_UNUSED = 0;
-
virtual bool isRegistrationEnabled() const A_WARN_UNUSED = 0;
virtual void getRegistrationDetails() const = 0;
diff --git a/src/net/registrationoptions.h b/src/net/registrationoptions.h
deleted file mode 100644
index 99078e0ad..000000000
--- a/src/net/registrationoptions.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2009 The Mana World Development Team
- * Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2015 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef NET_REGISTRATIONOPTIONS_H
-#define NET_REGISTRATIONOPTIONS_H
-
-namespace Net
-{
- namespace RegistrationOptions
- {
- enum
- {
- Unregister = 0x1,
- ChangeEmail = 0x2,
- SetEmailOnRegister = 0x4,
- SetGenderOnRegister = 0x8
- };
- }
-} // namespace Net
-
-#endif // NET_REGISTRATIONOPTIONS_H
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 5a8aaf6c6..878499df6 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -125,11 +125,6 @@ void LoginHandler::requestUpdateHosts()
{
}
-int LoginHandler::supportedOptionalActions() const
-{
- return Net::RegistrationOptions::SetGenderOnRegister;
-}
-
void LoginHandler::sendVersion() const
{
}
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index e22e5c2bf..0f7adec48 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -43,8 +43,6 @@ class LoginHandler final : public Ea::LoginHandler
void disconnect() override final;
- int supportedOptionalActions() const override final A_WARN_UNUSED;
-
unsigned int getMaxPasswordLength() const override final A_WARN_UNUSED
{ return 24; }