[sd2_mr0569] add direct semaphore lock to ahn_quiraj instance (need c…

…heck Win compile). related to #138
mangosR2 · Mar 8, 2013 · 38d9ee6 · 38d9ee6
1 parent a20275f
commit 38d9ee6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp b/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
@@ -136,16 +136,21 @@ void instance_ruins_of_ahnqiraj::OnCreatureDeath(Creature* pCreature)
             if (GetData(TYPE_RAJAXX) != IN_PROGRESS)
                 break;
 
-            GuidSet& army = m_sArmyWavesGuids[m_uiCurrentArmyWave - 1];
+            bool startNext = false;
+            {
+                MAPLOCK_WRITE(pCreature, MAP_LOCK_TYPE_DEFAULT);
+                GuidSet& army = m_sArmyWavesGuids[m_uiCurrentArmyWave - 1];
 
-            if (army.empty() || army.find(guid) == army.end())
-                break;
+                if (army.empty() || army.find(guid) == army.end())
+                    break;
 
-            // Check if the dead creature belongs to the current wave
-            army.erase(guid);
+                // Check if the dead creature belongs to the current wave
+                army.erase(guid);
+                startNext = army.empty();
+            }
 
             // If all the soldiers from the current wave are dead, then send the next one
-            if (army.empty())
+            if (startNext)
                 DoSendNextArmyWave();
 
             break;

diff --git a/sd2_revision_R2.h b/sd2_revision_R2.h
@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_R2_H__
 #define __SD2_REVISION_R2_H__
- #define SD2_REVISION_R2 "0568"
+ #define SD2_REVISION_R2 "0569"
 #endif // __SD2_REVISION_R2_H__