*Merge with Trinity 793.

--HG-- branch : trunk
2009-01-06 12:15:18 -06:00
parent 215039055b 290a187592
commit 2b21f0e730
21 changed files with 200 additions and 95 deletions
@@ -547,6 +547,8 @@ class World
        uint32 mail_timer_expires;
        uint32 m_updateTime, m_updateTimeSum;
        uint32 m_updateTimeCount;
+        uint32 m_currentTime;
+        void RecordTimeDiff(const char * text);

        typedef UNORDERED_MAP<uint32, Weather*> WeatherMap;
        WeatherMap m_weathers;