diff options
| author | megamage <none@none> | 2009-02-04 10:53:58 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-04 10:53:58 -0600 |
| commit | df7499e0565116c356308839079c36943ba7949c (patch) | |
| tree | 5c7b362962dc49e95601eea5ccfe5102b370639d /src/shared/Timer.h | |
| parent | 50c82c666093b5dac3cd60cddf9f46223a48d8d9 (diff) | |
| parent | 6b19b789ca1757b99a5eaf37fba7c3f555347ab1 (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 7bc0031a5de..848a8cfac4f 100644 --- a/src/shared/Timer.h +++ b/src/shared/Timer.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> * * Copyright (C) 2008 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; |