*Merge.

--HG-- branch : trunk
2009-04-04 13:11:03 -06:00
parent b858dd535a 19f725cd51
commit e53521d228
12 changed files with 133 additions and 79 deletions
@@ -484,7 +484,8 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O
        time_t i_gridExpiry;

        bool i_lock;
-        std::vector<uint64> i_unitsToNotify;
+        std::vector<uint64> i_unitsToNotifyBacklog;
+        std::vector<Unit*> i_unitsToNotify;
        std::set<WorldObject *> i_objectsToRemove;
        std::map<WorldObject*, bool> i_objectsToSwitch;