[7362] Use IN_MILISECONDS where appropriate, other cleanups. Author: VladimirMangos
--HG-- branch : trunk
This commit is contained in:
+2
-2
@@ -1982,7 +1982,7 @@ class TRINITY_DLL_SPEC Player : public Unit
|
||||
/*** REST SYSTEM ***/
|
||||
/*********************************************************/
|
||||
|
||||
bool isRested() const { return GetRestTime() >= 10000; }
|
||||
bool isRested() const { return GetRestTime() >= 10*IN_MILISECONDS; }
|
||||
uint32 GetXPRestBonus(uint32 xp);
|
||||
uint32 GetRestTime() const { return m_restTime;};
|
||||
void SetRestTime(uint32 v) { m_restTime = v;};
|
||||
@@ -2446,7 +2446,7 @@ template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T &bas
|
||||
continue;
|
||||
|
||||
// special case (skip >10sec spell casts for instant cast setting)
|
||||
if( mod->op==SPELLMOD_CASTING_TIME && basevalue >= T(10000) && mod->value <= -100)
|
||||
if( mod->op==SPELLMOD_CASTING_TIME && basevalue >= T(10*IN_MILISECONDS) && mod->value <= -100)
|
||||
continue;
|
||||
|
||||
totalpct += mod->value;
|
||||
|
||||
Reference in New Issue
Block a user