mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-25 13:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10677] Send to creature/etc Update call real diff from last update and use it.

Browse source 
Now in case when creature/etc some tices not updates in result stay
in not active (no near players or active objects) cell some important
timers (corpse decay, summon timers, group loot expire, aura durations, etc) will
updates at real diff time from last prev. update call.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>

For some systems added exclude use real diff time because current limitations
like move generators. So its stay use last tick diff and considered freeze and
skip all time while creature in not active map part.
This commit is contained in:
cipherCOM 2010-11-03 06:49:18 +03:00 • committed by VladimirMangos
parent 62c0963f37
commit 555c1a9094
35 changed files with 162 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/game/Pet.cpp
View file

@ -482,7 +482,7 @@ void Pet::SetDeathState(DeathState s) // overwrite virtual
}
}
void Pet::Update(uint32 diff)
void Pet::Update(uint32 update_diff, uint32 tick_diff)
{
if(m_removed) // pet already removed, just wait in remove queue, no updates
return;
@ -491,7 +491,7 @@ void Pet::Update(uint32 diff)
{
case CORPSE:
{
if (m_corpseDecayTimer <= diff)
if (m_corpseDecayTimer <= update_diff)
{
MANGOS_ASSERT(getPetType()!=SUMMON_PET && "Must be already removed.");
Remove(PET_SAVE_NOT_IN_SLOT); //hunters' pets never get removed because of death, NEVER!
@ -520,8 +520,8 @@ void Pet::Update(uint32 diff)
if (m_duration > 0)
{
if(m_duration > (int32)diff)
m_duration -= (int32)diff;
if (m_duration > (int32)update_diff)
m_duration -= (int32)update_diff;
else
{
Remove(getPetType() != SUMMON_PET ? PET_SAVE_AS_DELETED:PET_SAVE_NOT_IN_SLOT);
@ -530,7 +530,7 @@ void Pet::Update(uint32 diff)
}
//regenerate focus for hunter pets or energy for deathknight's ghoul
if(m_regenTimer <= diff)
if (m_regenTimer <= update_diff)
{
switch (getPowerType())
{
@ -544,25 +544,25 @@ void Pet::Update(uint32 diff)
m_regenTimer = 4000;
}
else
m_regenTimer -= diff;
m_regenTimer -= update_diff;
if(getPetType() != HUNTER_PET)
if (getPetType() != HUNTER_PET)
break;
if(m_happinessTimer <= diff)
if (m_happinessTimer <= update_diff)
{
LooseHappiness();
m_happinessTimer = 7500;
}
else
m_happinessTimer -= diff;
m_happinessTimer -= update_diff;
break;
}
default:
break;
}
Creature::Update(diff);
Creature::Update(update_diff, tick_diff);
}
void Pet::Regenerate(Powers power)