summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/net/tmwa/charserverhandler.cpp11
-rw-r--r--src/net/tmwa/loginhandler.cpp13
-rw-r--r--src/net/tmwa/network.h5
3 files changed, 6 insertions, 23 deletions
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
{