Changed eAthena protocol name to TmwAthena and changed the config files accordingly.

This makes room for the actual eAthena protocol future inclusion.

3 files changed, 11 insertions, 11 deletions

diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index dfe809bc..0fba5638 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -57,10 +57,10 @@ static std::string serverTypeToString(ServerInfo::Type type)
 {
     switch (type)
     {
-    case ServerInfo::EATHENA:
-        return "eAthena";
+    case ServerInfo::TMWATHENA:
+        return "TmwAthena";
     case ServerInfo::MANASERV:
-        return "manaserv";
+        return "ManaServ";
     default:
         return "";
     }
@@ -71,7 +71,7 @@ static unsigned short defaultPortForServerType(ServerInfo::Type type)
     switch (type)
     {
     default:
-    case ServerInfo::EATHENA:
+    case ServerInfo::TMWATHENA:
         return 6901;
     case ServerInfo::MANASERV:
         return 9601;
@@ -116,9 +116,9 @@ void ServersListModel::setVersionString(int index, const std::string &version)
 std::string TypeListModel::getElementAt(int elementIndex)
 {
     if (elementIndex == 0)
-        return "eAthena";
+        return "TmwAthena";
     else if (elementIndex == 1)
-        return "Manaserv";
+        return "ManaServ";
     else
         return "Unknown";
 }
@@ -332,7 +332,7 @@ void ServerDialog::action(const gcn::ActionEvent &event)
             switch (mTypeField->getSelected())
             {
                 case 0:
-                    mServerInfo->type = ServerInfo::EATHENA;
+                    mServerInfo->type = ServerInfo::TMWATHENA;
                     break;
                 case 1:
                     mServerInfo->type = ServerInfo::MANASERV;
@@ -398,7 +398,7 @@ void ServerDialog::valueChanged(const gcn::SelectionEvent &)
     mPortField->setText(toString(myServer.port));
     switch (myServer.type)
     {
-        case ServerInfo::EATHENA:
+        case ServerInfo::TMWATHENA:
         case ServerInfo::UNKNOWN:
             mTypeField->setSelected(0);
             break;
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 0a5b8d71..528e8539 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -301,7 +301,7 @@ void SkillDialog::loadSkills(const std::string &file)
     {
         logger->log("Error loading skills file: %s", file.c_str());
 
-        if (Net::getNetworkType() == ServerInfo::EATHENA)
+        if (Net::getNetworkType() == ServerInfo::TMWATHENA)
         {
             SkillModel *model = new SkillModel();
             SkillInfo *skill = new SkillInfo;
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index ac9bfb2e..99325db8 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -261,7 +261,7 @@ void Viewport::_drawDebugPath(Graphics *graphics)
 
     Path debugPath;
 
-    if (Net::getNetworkType() == ServerInfo::EATHENA)
+    if (Net::getNetworkType() == ServerInfo::TMWATHENA)
     {
         const int mouseTileX = (mMouseX + (int) mPixelViewX) / 32;
         const int mouseTileY = (mMouseY + (int) mPixelViewY) / 32;
@@ -305,7 +305,7 @@ void Viewport::_drawPath(Graphics *graphics, const Path &path,
 {
     graphics->setColor(color);
 
-    if (Net::getNetworkType() == ServerInfo::EATHENA)
+    if (Net::getNetworkType() == ServerInfo::TMWATHENA)
     {
         for (Path::const_iterator i = path.begin(); i != path.end(); ++i)
         {