summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/enums/net/servertype.h1
-rw-r--r--src/gui/models/typelistmodel.h8
-rw-r--r--src/gui/windows/editserverdialog.cpp18
-rw-r--r--src/gui/windows/serverdialog.cpp7
-rw-r--r--src/net/net.cpp1
-rw-r--r--src/net/serverinfo.h5
6 files changed, 9 insertions, 31 deletions
diff --git a/src/enums/net/servertype.h b/src/enums/net/servertype.h
index c44f07ae0..5624f2aed 100644
--- a/src/enums/net/servertype.h
+++ b/src/enums/net/servertype.h
@@ -29,7 +29,6 @@ enumStart(ServerType)
{
UNKNOWN = 0,
TMWATHENA,
- EVOL,
EATHENA,
EVOL2
}
diff --git a/src/gui/models/typelistmodel.h b/src/gui/models/typelistmodel.h
index fd972e0cd..39353db06 100644
--- a/src/gui/models/typelistmodel.h
+++ b/src/gui/models/typelistmodel.h
@@ -38,7 +38,7 @@ class TypeListModel final : public ListModel
*/
int getNumberOfElements() override final A_WARN_UNUSED
#if defined(EATHENA_SUPPORT) && defined(TMWA_SUPPORT)
- { return 4; }
+ { return 3; }
#elif defined(EATHENA_SUPPORT)
{ return 2; }
#else
@@ -54,12 +54,10 @@ class TypeListModel final : public ListModel
#ifdef TMWA_SUPPORT
if (elementIndex == 0)
return "TmwAthena";
- else if (elementIndex == 1)
- return "Evol";
#ifdef EATHENA_SUPPORT
- else if (elementIndex == 2)
+ else if (elementIndex == 1)
return "eAthena";
- else if (elementIndex == 3)
+ else if (elementIndex == 2)
return "Evol2";
#endif // EATHENA_SUPPORT
else
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index d45d46be3..47a0f0335 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -143,7 +143,7 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent,
case ServerType::EATHENA:
#ifdef EATHENA_SUPPORT
#ifdef TMWA_SUPPORT
- mTypeField->setSelected(2);
+ mTypeField->setSelected(1);
#else // TMWA_SUPPORT
mTypeField->setSelected(0);
#endif // TMWA_SUPPORT
@@ -156,17 +156,10 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent,
case ServerType::TMWATHENA:
mTypeField->setSelected(0);
break;
- case ServerType::EVOL:
-#ifdef TMWA_SUPPORT
- mTypeField->setSelected(1);
-#else // TMWA_SUPPORT
- mTypeField->setSelected(0);
-#endif // TMWA_SUPPORT
- break;
case ServerType::EVOL2:
#ifdef EATHENA_SUPPORT
#ifdef TMWA_SUPPORT
- mTypeField->setSelected(3);
+ mTypeField->setSelected(2);
#else // TMWA_SUPPORT
mTypeField->setSelected(1);
#endif // TMWA_SUPPORT
@@ -243,14 +236,11 @@ void EditServerDialog::action(const ActionEvent &event)
case 0:
mServer.type = ServerType::TMWATHENA;
break;
- case 1:
- mServer.type = ServerType::EVOL;
- break;
#ifdef EATHENA_SUPPORT
- case 2:
+ case 1:
mServer.type = ServerType::EATHENA;
break;
- case 3:
+ case 2:
mServer.type = ServerType::EVOL2;
break;
#endif
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 158d5909e..179173d2c 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -53,14 +53,10 @@ static std::string serverTypeToString(const ServerTypeT type)
{
switch (type)
{
-#ifdef TMWA_SUPPORT
case ServerType::TMWATHENA:
+#ifdef TMWA_SUPPORT
return "TmwAthena";
- case ServerType::EVOL:
- return "Evol";
#else
- case ServerType::TMWATHENA:
- case ServerType::EVOL:
return "";
#endif
#ifdef EATHENA_SUPPORT
@@ -92,7 +88,6 @@ static uint16_t defaultPortForServerType(const ServerTypeT type)
case ServerType::UNKNOWN:
#ifdef TMWA_SUPPORT
case ServerType::TMWATHENA:
- case ServerType::EVOL:
#endif
return 6901;
}
diff --git a/src/net/net.cpp b/src/net/net.cpp
index f58b624e9..49ce1321f 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -141,7 +141,6 @@ void connectToServer(const ServerInfo &server)
#endif
break;
case ServerType::TMWATHENA:
- case ServerType::EVOL:
case ServerType::UNKNOWN:
default:
#ifdef TMWA_SUPPORT
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index efbdf015a..6e7eb718b 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -151,11 +151,8 @@ class ServerInfo final
#ifdef TMWA_SUPPORT
if (compareStrI(serverType, "tmwathena") == 0)
return ServerType::TMWATHENA;
- if (compareStrI(serverType, "evol") == 0)
- return ServerType::EVOL;
#else
- if (compareStrI(serverType, "tmwathena") == 0
- || compareStrI(serverType, "evol") == 0)
+ if (compareStrI(serverType, "tmwathena") == 0)
return ServerType::EATHENA;
#endif
#ifdef EATHENA_SUPPORT