Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Transports: replace getMSTime with GetGameTimeMS

Browse Source
This commit is contained in:
Ovahlord committed 2019-05-27 15:46:22 +02:00
1 parent 1323ae116c
commit 29b952c797
2 files changed
+11 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Entities/Object/Object.cpp
+3 -3
View File
@@ -640,10 +640,10 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
{
if (GameObject const* go = ToGameObject())
{
if (go->ToTransport())
*data << uint32(go->ToTransport()->GetPathProgress());
if (Transport const* transport = go->ToTransport())
*data << uint32(transport->GetPathProgress());
else
*data << uint32(getMSTime());
*data << uint32(GameTime::GetGameTimeMS());
}
}
}
src/server/game/Entities/Transport/Transport.cpp
+8 -7
View File
@@ -21,6 +21,7 @@
#include "Common.h"
#include "DBCStores.h"
#include "GameObjectAI.h"
#include "GameTime.h"
#include "Log.h"
#include "MapManager.h"
#include "ObjectMgr.h"
@@ -204,7 +205,7 @@ bool Transport::Create(ObjectGuid::LowType guidlow, uint32 entry, Map* map, uint
_isDynamicTransport = m_goValue.Transport.StopFrames->empty();
uint32 pathProgress = getMSTime();
uint32 pathProgress = GameTime::GetGameTimeMS();
if (m_goValue.Transport.AnimationInfo)
pathProgress -= pathProgress % GetTransportPeriod();
@@ -364,7 +365,7 @@ void Transport::Update(uint32 diff)
}
}
SetPathProgress(getMSTime() + GetCurrentTransportTime());
SetPathProgress(GameTime::GetGameTimeMS() + GetCurrentTransportTime());
RelocateToProgress(GetCurrentTransportTime());
}
@@ -503,7 +504,7 @@ void Transport::SetTransportState(GOState state, uint32 stopFrame /*= 0*/)
if (GetGoState() >= GO_STATE_TRANSPORT_STOPPED)
stopTimer = m_goValue.Transport.StopFrames->at(GetGoState() - GO_STATE_TRANSPORT_STOPPED);
SetUInt32Value(GAMEOBJECT_LEVEL, getMSTime() + stopTimer);
SetUInt32Value(GAMEOBJECT_LEVEL, GameTime::GetGameTimeMS() + stopTimer);
}
else
{
@@ -518,16 +519,16 @@ void Transport::SetTransportState(GOState state, uint32 stopFrame /*= 0*/)
// forward movement. target frame time - current frame time
if (GetCurrentTransportTime() < stopTimer)
SetUInt32Value(GAMEOBJECT_LEVEL, getMSTime() + stopTimer - GetCurrentTransportTime());
SetUInt32Value(GAMEOBJECT_LEVEL, GameTime::GetGameTimeMS() + stopTimer - GetCurrentTransportTime());
else if (backwardsTimer)
SetUInt32Value(GAMEOBJECT_LEVEL, getMSTime() + backwardsTimer);
SetUInt32Value(GAMEOBJECT_LEVEL, GameTime::GetGameTimeMS() + backwardsTimer);
else
SetUInt32Value(GAMEOBJECT_LEVEL, getMSTime() + GetCurrentTransportTime() - stopTimer);
SetUInt32Value(GAMEOBJECT_LEVEL, GameTime::GetGameTimeMS() + GetCurrentTransportTime() - stopTimer);
state = GOState(GO_STATE_TRANSPORT_STOPPED + stopFrame);
}
uint32 pathProgress = getMSTime();
uint32 pathProgress = GameTime::GetGameTimeMS();
if (m_goValue.Transport.AnimationInfo)
pathProgress -= pathProgress % GetTransportPeriod();