diff options
| author | megamage <none@none> | 2009-02-04 17:22:43 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-04 17:22:43 -0600 |
| commit | d69198732e65002b53bab3a85779107490fe4dd2 (patch) | |
| tree | e1f4b11f1964cc42ac05c79bdc43eedc1db16866 /src/shared/Timer.h | |
| parent | 5d4d9530556eb66940775f12c3cc5f3c115447ca (diff) | |
| parent | c745eba4a1d122b4184b27a982674c86ff193c23 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/shared/Timer.h')
| -rw-r--r-- | src/shared/Timer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/Timer.h b/src/shared/Timer.h index a27f4889049..30f5966afce 100644 --- a/src/shared/Timer.h +++ b/src/shared/Timer.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -50,7 +50,7 @@ inline uint32 getMSTime() 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) + if (oldMSTime > newMSTime) return (0xFFFFFFFF - oldMSTime) + newMSTime; else return newMSTime - oldMSTime; |