diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-28 22:14:48 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-28 22:14:48 +0100 |
| commit | b2d05c9cdd19abf005f249ace7f59d2c4fc2bbf1 (patch) | |
| tree | 72b2717bf2a10cf86fc49f99ffde2bcd0100f708 /dep/g3dlite/source/System.cpp | |
| parent | 47d7c3a6adbc9f11066a26136bbad440ee3c8641 (diff) | |
| parent | d069e1b6b4d9f839df1a823d0ec1ddfa6dea303c (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Player/Player.h
src/server/game/Spells/SpellMgr.cpp
Diffstat (limited to 'dep/g3dlite/source/System.cpp')
| -rw-r--r-- | dep/g3dlite/source/System.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dep/g3dlite/source/System.cpp b/dep/g3dlite/source/System.cpp index 809f05c0ab4..f6b0e038f27 100644 --- a/dep/g3dlite/source/System.cpp +++ b/dep/g3dlite/source/System.cpp @@ -888,7 +888,11 @@ void System::initTime() { if (localTimeVals) { // tm_gmtoff is already corrected for daylight savings. + #ifdef __CYGWIN__ + local = local + _timezone; + #else local = local + localTimeVals->tm_gmtoff; + #endif } m_realWorldGetTickTime0 = local; |