mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 04:37:00 +00:00
[10924] Send time diff between Update() calls for object - should help with mob respawn on inactive grids etc. Based on patches by VladimirMangos and cipherCOM. All issues from previous patches should be finally fixed now.
Signed-off-by: Ambal <pogrebniak@gala.net>
This commit is contained in:
parent
72b1d30a1c
commit
b11820593c
39 changed files with 284 additions and 149 deletions
|
|
@ -22,20 +22,44 @@
|
|||
#include "Common.h"
|
||||
#include <ace/OS_NS_sys_time.h>
|
||||
|
||||
inline uint32 getMSTime()
|
||||
class WorldTimer
|
||||
{
|
||||
static const ACE_Time_Value ApplicationStartTime = ACE_OS::gettimeofday();
|
||||
return (ACE_OS::gettimeofday() - ApplicationStartTime).msec();
|
||||
}
|
||||
public:
|
||||
|
||||
inline uint32 getMSTimeDiff(uint32 oldMSTime, uint32 newMSTime)
|
||||
{
|
||||
// getMSTime() have limited data range and this is case when it overflow in this tick
|
||||
if (oldMSTime > newMSTime)
|
||||
return (uint32(0xFFFFFFFF) - oldMSTime) + newMSTime;
|
||||
else
|
||||
return newMSTime - oldMSTime;
|
||||
}
|
||||
//get current server time
|
||||
static uint32 getMSTime();
|
||||
|
||||
//get time difference between two timestamps
|
||||
static inline uint32 getMSTimeDiff(const uint32& oldMSTime, const uint32& newMSTime)
|
||||
{
|
||||
if (oldMSTime > newMSTime)
|
||||
{
|
||||
const uint32 diff_1 = (uint32(0xFFFFFFFF) - oldMSTime) + newMSTime;
|
||||
const uint32 diff_2 = oldMSTime - newMSTime;
|
||||
|
||||
return std::min(diff_1, diff_2);
|
||||
}
|
||||
|
||||
return newMSTime - oldMSTime;
|
||||
}
|
||||
|
||||
//get last world tick time
|
||||
static MANGOS_DLL_SPEC uint32 tickTime();
|
||||
//get previous world tick time
|
||||
static MANGOS_DLL_SPEC uint32 tickPrevTime();
|
||||
//tick world timer
|
||||
static MANGOS_DLL_SPEC uint32 tick();
|
||||
|
||||
private:
|
||||
WorldTimer();
|
||||
WorldTimer(const WorldTimer& );
|
||||
|
||||
//analogue to getMSTime() but it persists m_SystemTickTime
|
||||
static uint32 getMSTime_internal(bool savetime = false);
|
||||
|
||||
static MANGOS_DLL_SPEC uint32 m_iTime;
|
||||
static MANGOS_DLL_SPEC uint32 m_iPrevTime;
|
||||
};
|
||||
|
||||
class IntervalTimer
|
||||
{
|
||||
|
|
@ -118,4 +142,4 @@ struct ShortTimeTracker
|
|||
int32 i_expiryTime;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue