server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Movement changes

Browse Source 
Works slightly better than before, not perfect though

Thanks to TrinityCore, CMangos and OregonCore for references
This commit is contained in:
Foereaper 2015-08-19 19:50:15 +02:00
parent 053d360623
commit 025ca0692e
4 changed files with 15 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/Object/Unit.h
View File

@ -655,7 +655,7 @@ class MovementInfo
}
ObjectGuid const& GetTransportGuid() const { return t_guid; }
Position const* GetTransportPos() const { return &t_pos; }
uint32 GetTime() const { return time; }
uint32 GetTime() { return time; }
uint32 GetTransportTime() const { return t_time; }
uint32 GetFallTime() const { return fallTime; }
void ChangeOrientation(float o) { pos.o = o; }

2
src/game/Server/WorldSession.cpp
View File

@ -100,7 +100,7 @@ WorldSession::WorldSession(uint32 id, WorldSocket* sock, AccountTypes sec, time_
_player(NULL), m_Socket(sock), _security(sec), _accountId(id), _warden(NULL), _build(0), _logoutTime(0),
m_inQueue(false), m_playerLoading(false), m_playerLogout(false), m_playerRecentlyLogout(false), m_playerSave(false),
m_sessionDbcLocale(sWorld.GetAvailableDbcLocale(locale)), m_sessionDbLocaleIndex(sObjectMgr.GetIndexForLocale(locale)),
m_latency(0), m_tutorialState(TUTORIALDATA_UNCHANGED)
m_latency(0), m_clientTimeDelay(0), m_tutorialState(TUTORIALDATA_UNCHANGED)
{
if (sock)
{

2
src/game/Server/WorldSession.h
View File

@ -775,7 +775,7 @@ class WorldSession
uint32 m_latency;
uint32 m_Tutorials[8];
TutorialDataState m_tutorialState;
int32 m_clientTimeDelay;
uint32 m_clientTimeDelay;
ACE_Based::LockedQueue<WorldPacket*, ACE_Thread_Mutex> _recvQueue;
};
#endif

69
src/game/WorldHandlers/MovementHandler.cpp
View File

@ -36,42 +36,7 @@
#include "MapPersistentStateMgr.h"
#include "ObjectMgr.h"
#if defined(WIN32) && !defined(__MINGW32__)
#include <mmsystem.h>
#pragma comment(lib, "winmm.lib")
#define DELTA_EPOCH_IN_USEC 11644473600000000ULL
uint32 mTimeStamp()
{
/* We subtract 20 years from the epoch so that it doesn't overflow uint32
* TODO: Remember to update code in 20 years */
const uint32 YEAR_IN_SECONDS = 31556952;
FILETIME ft;
uint64 t;
GetSystemTimeAsFileTime(&ft);
t = (uint64)ft.dwHighDateTime << 32;
t |= ft.dwLowDateTime;
t /= 10;
t -= DELTA_EPOCH_IN_USEC;
return uint32((((t / 1000000L) * 1000) + ((t % 1000000L) / 1000)) - ((YEAR_IN_SECONDS * 20) * 1000LL));
}
#else
#include <time.h>
uint32 mTimeStamp()
{
struct timeval tp;
const uint32 YEAR_IN_SECONDS = 31556952;
gettimeofday(&tp, NULL);
uint32 return_val = (((tp.tv_sec * 1000) + (tp.tv_usec / 1000)) - ((YEAR_IN_SECONDS * 20) * 1000));
return return_val;
}
#endif
#define MOVEMENT_PACKET_TIME_DELAY 300
void WorldSession::HandleMoveWorldportAckOpcode(WorldPacket& /*recv_data*/)
{
@ -307,15 +272,6 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recv_data)
movementInfo.Read(recv_data);
/*----------------*/
// Calculate timestamp
uint32 move_time, mstime;
mstime = mTimeStamp();
if (m_clientTimeDelay == 0)
m_clientTimeDelay = mstime - movementInfo.GetTime();
move_time = (movementInfo.GetTime() - (mstime - m_clientTimeDelay) + mstime + 500);
movementInfo.UpdateTime(move_time);
if (!VerifyMovementInfo(movementInfo))
{ return; }
@ -469,7 +425,7 @@ void WorldSession::HandleMoveKnockBackAck(WorldPacket& recv_data)
recv_data >> guid;
recv_data >> Unused<uint32>(); // Always set to zero?
movementInfo.Read(recv_data);
recv_data >> movementInfo;
/* Make sure input is valid */
if (!VerifyMovementInfo(movementInfo, guid))
@ -479,21 +435,14 @@ void WorldSession::HandleMoveKnockBackAck(WorldPacket& recv_data)
HandleMoverRelocation(movementInfo);
/* Weird size, maybe needs correcting */
WorldPacket data(MSG_MOVE_KNOCK_BACK, uint16(recv_data.size() + 4));
data.appendPackGUID(guid);
/* Includes data shown below (but in different order) */
movementInfo.Write(data);
/* This is sent in addition to the rest of the movement data (yes, angle+velocity are sent twice) */
WorldPacket data(MSG_MOVE_KNOCK_BACK, recv_data.size() + 15);
data << mover->GetObjectGuid();
data << movementInfo;
data << movementInfo.GetJumpInfo().sinAngle;
data << movementInfo.GetJumpInfo().cosAngle;
data << movementInfo.GetJumpInfo().xyspeed;
data << movementInfo.GetJumpInfo().velocity;
/* Do we really need to send the data to everyone? Seemed to work better */
mover->SendMessageToSet(&data, false);
mover->SendMessageToSetExcept(&data, _player);
}
void WorldSession::SendKnockBack(float angle, float horizontalSpeed, float verticalSpeed)
@ -579,6 +528,12 @@ bool WorldSession::VerifyMovementInfo(MovementInfo const& movementInfo) const
void WorldSession::HandleMoverRelocation(MovementInfo& movementInfo)
{
uint32 mstime = WorldTimer::getMSTime();
if (m_clientTimeDelay == 0)
m_clientTimeDelay = mstime - movementInfo.GetTime();
movementInfo.UpdateTime(movementInfo.GetTime() + m_clientTimeDelay + MOVEMENT_PACKET_TIME_DELAY);
Unit* mover = _player->GetMover();
if (Player* plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL)