Changeset 126 for trunk/src/game/ObjectAccessor.cpp

Timestamp:

11/19/08 13:38:32 (17 years ago)

Author:

yumileroy

Message:

[svn] * Fixed startup error flood if creature model id is 0
* Fixed totems using proper model ids broken after recent change
* Set pet grid activity state to that of caster upon summoning
* Fix a possible crash in ObjectAccessor?
note to self: don't commit anything without 3 days testing. ever. after this one ofc.

Original author: w12x
Date: 2008-10-27 15:28:04-05:00

Files:

• trunk/src/game/ObjectAccessor.cpp (modified) (1 diff)

trunk/src/game/ObjectAccessor.cpp

@@ -534 +534 @@
         std::set<WorldObject *> activeobjects(i_activeobjects);
 
-        std::set<WorldObject *>::const_iterator itr;
-        for(itr = activeobjects.begin(); itr != activeobjects.end(); ++itr)
-        {
-            (*itr)->GetMap()->resetMarkedCells();
+        std::set<WorldObject *>::iterator itr, next;
+        for(itr = activeobjects.begin(); itr != activeobjects.end(); itr = next)
+        {
+            next = itr;
+            ++next;
+            if((*itr)->IsInWorld())
+                (*itr)->GetMap()->resetMarkedCells();
+            else
+                activeobjects.erase(itr);
         }