Halls of Stone: Maiden of Grief blink exploiting fix & fix compile again

--HG--
branch : trunk

src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp

@@ -65,7 +65,12 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI
         AchievTimer = 0;
 
         if (pInstance)
+        {
             pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, NOT_STARTED);
+            if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAIDEN_DOOR)))
+                if (pDoor->GetGoState() == GO_STATE_READY)
+                    EnterEvadeMode();
+        }
     }
 
     void EnterCombat(Unit* who)

src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp

@@ -115,9 +115,9 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI
         if (pInstance)
         {
             pInstance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS);
-            if (GameObject pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR)) &&
-                pDoor->GetGoState() == GO_STATE_READY)
-                EnterEvadeMode();
+            if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR)))
+                if (pDoor->GetGoState() == GO_STATE_READY)
+                    EnterEvadeMode();
         }
     }
 

src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp

@@ -71,7 +71,7 @@ enum Texts
     TEXT_ID_PROGRESS                    = 13101
 };
 
-enum Creatures
+enum BrannCreatures
 {
     CREATURE_TRIBUNAL_OF_THE_AGES       = 28234,
     CREATURE_BRANN_BRONZEBEARD          = 28070,
@@ -80,7 +80,6 @@ enum Creatures
     CREATURE_DARK_RUNE_PROTECTOR        = 27983,
     CREATURE_DARK_RUNE_STORMCALLER      = 27984,
     CREATURE_IRON_GOLEM_CUSTODIAN       = 27985,
-    CREATURE_KADDRAK                    = 30898
 };
 
 enum Spells

src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h

@@ -20,7 +20,8 @@ enum Data64
     DATA_GO_MARNAK,
     DATA_GO_ABEDNEUM,
     DATA_GO_SKY_FLOOR,
-    DATA_SJONNIR_DOOR
+    DATA_SJONNIR_DOOR,
+    DATA_MAIDEN_DOOR
 };
 enum Creatures
 {

src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp

@@ -187,6 +187,7 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance
             case DATA_GO_MARNAK:                       return uiMarnakGo;
             case DATA_GO_SKY_FLOOR:                    return uiTribunalSkyFloor;
             case DATA_SJONNIR_DOOR:                    return uiSjonnirDoor;
+            case DATA_MAIDEN_DOOR:                     return uiMaidenOfGriefDoor;
         }
 
         return 0;