summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/client.cpp1
-rw-r--r--src/client.h1
-rw-r--r--src/net/tmwa/loginhandler.cpp26
3 files changed, 26 insertions, 2 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 1afd8f477..7ab7cb328 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -184,6 +184,7 @@ volatile int cur_time;
volatile bool runCounters;
bool isSafeMode = false;
int serverVersion = 0;
+unsigned int tmwServerVersion = 0;
int start_time;
int textures_count = 0;
diff --git a/src/client.h b/src/client.h
index 257180a73..fe19a7154 100644
--- a/src/client.h
+++ b/src/client.h
@@ -59,6 +59,7 @@ extern volatile int tick_time;
extern volatile int cur_time;
extern bool isSafeMode;
extern int serverVersion;
+extern unsigned int tmwServerVersion;
extern int start_time;
extern int textures_count;
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 4f7a35d3b..91e2c3027 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -196,16 +196,38 @@ void LoginHandler::processServerVersion(Net::MessageIn &msg)
mRegistrationEnabled = options & FLAG_REGISTRATION;
msg.skip(2); // 0 unused
serverVersion = msg.readInt8();
+ tmwServerVersion = 0;
if (serverVersion >= 5)
requestUpdateHosts();
}
+ else if (b1 == 255)
+ { // old TMWA
+ const unsigned int options = msg.readInt32();
+ mRegistrationEnabled = options & FLAG_REGISTRATION;
+ serverVersion = 0;
+ tmwServerVersion = 0;
+ }
+ else if (b1 >= 0x0d)
+ { // new TMWA
+ const unsigned int options = msg.readInt32();
+ mRegistrationEnabled = options & FLAG_REGISTRATION;
+ serverVersion = 0;
+ tmwServerVersion = (b1 << 16) | (b2 << 8) | b3;
+ }
else
- {
+ { // eAthena
const unsigned int options = msg.readInt32();
mRegistrationEnabled = options & FLAG_REGISTRATION;
serverVersion = 0;
+ tmwServerVersion = 0;
}
- logger->log("Server version: %d", serverVersion);
+ if (serverVersion > 0)
+ logger->log("Evol server version: %d", serverVersion);
+ else if (tmwServerVersion > 0)
+ logger->log("Tmw server version: x%06x", tmwServerVersion);
+ else
+ logger->log("Server witout version");
+
if (serverVersion < 5)
{
if (client->getState() != STATE_LOGIN)