diff options
| author | maximius <none@none> | 2009-10-31 16:44:14 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-10-31 16:44:14 -0700 |
| commit | a22da32a511448b273ec3b4a3d620202cf3a35f9 (patch) | |
| tree | 6758e09bd9d3f6293cc79f342155a9618f4ab360 | |
| parent | bf4909cfb66e15e841528cd3797dc1dc0d8e25e8 (diff) | |
*Correctly update negative aura duration at loading, thanks Sisif
--HG--
branch : trunk
| -rw-r--r-- | src/game/Pet.cpp | 4 | ||||
| -rw-r--r-- | src/game/Player.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 6275bd8a75b..b5995120a9e 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -1189,10 +1189,10 @@ void Pet::_LoadAuras(uint32 timediff) // negative effects should continue counting down after logout if (remaintime != -1 && !IsPositiveSpell(spellid)) { - if(remaintime <= int32(timediff)) + if (remaintime/IN_MILISECONDS <= int32(timediff)) continue; - remaintime -= timediff; + remaintime -= timediff*IN_MILISECONDS; } // prevent wrong values of remaincharges diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 4199e23c2e4..5733abb630d 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -15431,10 +15431,10 @@ void Player::_LoadAuras(QueryResult *result, uint32 timediff) // negative effects should continue counting down after logout if (remaintime != -1 && !IsPositiveSpell(spellid)) { - if(remaintime <= int32(timediff)) + if (remaintime/IN_MILISECONDS <= int32(timediff)) continue; - remaintime -= timediff; + remaintime -= timediff*IN_MILISECONDS; } // prevent wrong values of remaincharges |