Changeset 3150

Timestamp:

02/03/2010 02:10:27 PM (7 months ago)

Author:

jackpoz

Message:

MODIFIED: Better fix for r3149, thanks Wayland.

Location:

trunk/src/arcemu-world

Files:

• MapMgr.cpp (modified) (1 diff)
• MapMgr.h (modified) (1 diff)
• Object.cpp (modified) (1 diff)

trunk/src/arcemu-world/MapMgr.cpp

@@ -1494 +1494 @@
         // Update creatures.
         {
-                CreatureSet creatures(activeCreatures);
-                CreatureSet::iterator itr = creatures.begin();
+                creature_iterator = activeCreatures.begin();
                 Creature * ptr;
                 Pet * ptr2;
 
-                for(; itr != creatures.end();)
-                {
-                        ptr = *itr;
-                        ++itr;
-                        if( activeCreatures.find(ptr) != activeCreatures.end())//required by owners despawning creatures and deleting *(++itr)
-                                ptr->Update(difftime);
+                for(; creature_iterator != activeCreatures.end();)
+                {
+                        ptr = *creature_iterator;
+                        ++creature_iterator;
+                        ptr->Update(difftime);
                 }
 

trunk/src/arcemu-world/MapMgr.h

@@ -122 +122 @@
         uint32 m_CreatureHighGuid;
     std::vector< Creature* > CreatureStorage;
+        CreatureSet::iterator creature_iterator;//required by owners despawning creatures and deleting *(++itr)
         Creature * CreateCreature(uint32 entry, bool isVehicle = false);
 

trunk/src/arcemu-world/Object.cpp

@@ -3241 +3241 @@
         {
         case TYPEID_UNIT:
+                // check iterator
+                if(mgr->creature_iterator != mgr->activeCreatures.end() && (*mgr->creature_iterator) == TO_CREATURE(this))
+                        ++mgr->creature_iterator;
                 mgr->activeCreatures.erase((Creature*)this);
                 break;