summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-15 21:46:45 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-15 21:46:45 +0300
commit365b09d7029abf778d4210cb47f393dee5d749a5 (patch)
treeb71ea1994aa2db4ccc1b7f4df612676d441aacf0 /src/gui/windows
parent77afc97b4d6e4caace275d8bc21a94525ad070e2 (diff)
downloadplus-365b09d7029abf778d4210cb47f393dee5d749a5.tar.gz
plus-365b09d7029abf778d4210cb47f393dee5d749a5.tar.bz2
plus-365b09d7029abf778d4210cb47f393dee5d749a5.tar.xz
plus-365b09d7029abf778d4210cb47f393dee5d749a5.zip
Remove old evol server type.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/editserverdialog.cpp18
-rw-r--r--src/gui/windows/serverdialog.cpp7
2 files changed, 5 insertions, 20 deletions
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;
}