Changeset 3195

Timestamp:

03/03/2010 02:34:07 PM (6 months ago)

Author:

jackpoz

Message:

FIXED: Crash on WarsongGulch? shutdown.

Location:

trunk/src/arcemu-world

Files:

• WarsongGulch.cpp (modified) (2 diffs)
• WarsongGulch.h (modified) (1 diff)

trunk/src/arcemu-world/WarsongGulch.cpp

@@ -608 +608 @@
                 (*itr)->SetUInt32Value(GAMEOBJECT_FLAGS, 64);
                 (*itr)->SetByte(GAMEOBJECT_BYTES_1, 0, 0);
-                (*itr)->Despawn(5000, 0);
-        }
+        }
+
+        DespawnGates(5000);
 
         /* add the flags to the world */
@@ -644 +645 @@
 }
 
+void WarsongGulch::DespawnGates(uint32 delay)
+{
+        if(delay != 0)
+        {
+                sEventMgr.AddEvent(this, &WarsongGulch::DespawnGates, (uint32)0, EVENT_GAMEOBJECT_EXPIRE, delay, 1, EVENT_FLAG_DO_NOT_EXECUTE_IN_WORLD_CONTEXT);
+                return;
+        }
+        for(list<GameObject*>::iterator itr = m_gates.begin(); itr != m_gates.end(); ++itr)
+        {
+                (*itr)->Despawn(0,0);
+        }
+        m_gates.clear();
+}

trunk/src/arcemu-world/WarsongGulch.h

@@ -63 +63 @@
 
         void SetIsWeekend(bool isweekend);
+        void DespawnGates(uint32 delay);
 };