summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/net/tmwa/beinghandler.cpp1
-rw-r--r--src/net/tmwa/beingrecv.cpp17
-rw-r--r--src/net/tmwa/loginrecv.cpp11
-rw-r--r--src/net/tmwa/playerhandler.cpp1
-rw-r--r--src/net/tmwa/serverfeatures.cpp1
5 files changed, 8 insertions, 23 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 52a8bf67c..777dbf706 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -29,7 +29,6 @@
#include "debug.h"
extern Net::BeingHandler *beingHandler;
-extern int serverVersion;
namespace TmwAthena
{
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 1d8f16871..bbae0a1bd 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -55,8 +55,6 @@
#include "debug.h"
-extern int serverVersion;
-
namespace TmwAthena
{
@@ -261,8 +259,7 @@ void BeingRecv::processPlayerUpdate1(Net::MessageIn &msg)
else if (disguiseId)
{
actorManager->undelete(dstBeing);
- if (serverVersion < 1)
- beingHandler->requestNameById(id);
+ beingHandler->requestNameById(id);
}
uint8_t dir = dstBeing->getDirectionDelayed();
@@ -397,8 +394,7 @@ void BeingRecv::processPlayerUpdate2(Net::MessageIn &msg)
else if (disguiseId)
{
actorManager->undelete(dstBeing);
- if (serverVersion < 1)
- beingHandler->requestNameById(id);
+ beingHandler->requestNameById(id);
}
uint8_t dir = dstBeing->getDirectionDelayed();
@@ -529,8 +525,7 @@ void BeingRecv::processPlayerMove(Net::MessageIn &msg)
else if (disguiseId)
{
actorManager->undelete(dstBeing);
- if (serverVersion < 1)
- beingHandler->requestNameById(id);
+ beingHandler->requestNameById(id);
}
const uint8_t dir = dstBeing->getDirectionDelayed();
@@ -716,8 +711,7 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
if (dstBeing->getType() == ActorType::Npc)
{
actorManager->undelete(dstBeing);
- if (serverVersion < 1)
- beingHandler->requestNameById(id);
+ beingHandler->requestNameById(id);
}
}
@@ -925,8 +919,7 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
if (dstBeing->getType() == ActorType::Npc)
{
actorManager->undelete(dstBeing);
- if (serverVersion < 1)
- beingHandler->requestNameById(id);
+ beingHandler->requestNameById(id);
}
}
diff --git a/src/net/tmwa/loginrecv.cpp b/src/net/tmwa/loginrecv.cpp
index d86b65c23..40b7a2aba 100644
--- a/src/net/tmwa/loginrecv.cpp
+++ b/src/net/tmwa/loginrecv.cpp
@@ -75,20 +75,15 @@ void LoginRecv::processServerVersion(Net::MessageIn &msg)
serverVersion = 0;
tmwServerVersion = 0;
}
- if (serverVersion > 0)
- logger->log("Evol server version: %d", serverVersion);
- else if (tmwServerVersion > 0)
+ if (tmwServerVersion > 0)
logger->log("Tmw server version: x%06x", tmwServerVersion);
else
logger->log("Server without version");
updateProtocol();
- if (serverVersion < 5)
- {
- if (client->getState() != State::LOGIN)
- client->setState(State::LOGIN);
- }
+ if (client->getState() != State::LOGIN)
+ client->setState(State::LOGIN);
// Leave this last
Ea::LoginRecv::mVersionResponse = true;
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 8f7de1e64..b53f29664 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -32,7 +32,6 @@
#include "debug.h"
extern Net::PlayerHandler *playerHandler;
-extern int serverVersion;
namespace TmwAthena
{
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index 8337aa03e..675d399f6 100644
--- a/src/net/tmwa/serverfeatures.cpp
+++ b/src/net/tmwa/serverfeatures.cpp
@@ -22,7 +22,6 @@
#include "debug.h"
-extern int serverVersion;
extern unsigned int tmwServerVersion;
extern Net::ServerFeatures *serverFeatures;