From 45c13626f8c59f6d48d411545cb17aee117ef076 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 5 Mar 2016 20:05:26 +0300
Subject: Remove outdated protocol version checks from tmwa net code.

---
 src/net/tmwa/charserverhandler.cpp | 11 ++---------
 src/net/tmwa/loginhandler.cpp      | 13 ++-----------
 src/net/tmwa/network.h             |  5 ++---
 3 files changed, 6 insertions(+), 23 deletions(-)

(limited to 'src/net')

diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index c9db50260..9fc0478c2 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -126,15 +126,8 @@ void CharServerHandler::connect() const
     outMsg.writeInt32(token.session_ID2, "session id2");
     // [Fate] The next word is unused by the old char server, so we squeeze in
     //        mana client version information
-    if (serverVersion > 0)
-    {
-        outMsg.writeInt16(CLIENT_PROTOCOL_VERSION, "client protocol version");
-    }
-    else
-    {
-        outMsg.writeInt16(CLIENT_TMW_PROTOCOL_VERSION,
-            "client protocol version");
-    }
+    outMsg.writeInt16(CLIENT_PROTOCOL_VERSION,
+        "client protocol version");
     outMsg.writeInt8(Being::genderToInt(token.sex), "gender");
 
     // We get 4 useless bytes before the real answer comes in (what are these?)
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index e5022b2ec..ad6ad5dce 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -93,17 +93,8 @@ void LoginHandler::sendLoginRegister(const std::string &restrict username,
                                      A_UNUSED) const
 {
     createOutPacket(CMSG_LOGIN_REGISTER);
-    if (serverVersion > 0)
-    {
-        outMsg.writeInt32(CLIENT_PROTOCOL_VERSION,
-            "client protocol version");
-    }
-    else
-    {
-        outMsg.writeInt32(CLIENT_TMW_PROTOCOL_VERSION,
-            "client protocol version");
-    }
-
+    outMsg.writeInt32(CLIENT_PROTOCOL_VERSION,
+        "client protocol version");
     outMsg.writeString(username, 24, "login");
     outMsg.writeStringNoLog(password, 24, "password");
 
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h
index 13a57e864..11980d95c 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -26,11 +26,10 @@
 #include "net/ea/network.h"
 
 /**
- * Protocol version, reported to the eAthena char and mapserver who can adjust
+ * Protocol version, reported to the tmwa char and mapserver who can adjust
  * the protocol accordingly.
  */
-#define CLIENT_PROTOCOL_VERSION      12
-#define CLIENT_TMW_PROTOCOL_VERSION  5
+#define CLIENT_PROTOCOL_VERSION  5
 
 namespace TmwAthena
 {
-- 
cgit v1.2.3-60-g2f50