[1772] Remove unused definitions in uldaman instance script and correct prefix for a few

NoFantasy · NoFantasy · commit 84e33ace25e7 · 2010-08-10T09:01:26.000Z
Remove unused definitions in uldaman instance script and correct prefix for a few git-svn-id: https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2@1772 5f9c896b-1e26-0410-94da-f77f675e2462
diff --git a/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp b/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
@@ -17,7 +17,7 @@
 /* ScriptData
 SDName: Boss_Archaedas
 SD%Complete: 60
-SDComment: 
+SDComment: Need correct way to deal with awaken vault and guardian spells, waiting for additions in mangos for them (target combination 22/7)
 SDCategory: Uldaman
 EndScriptData */
 
@@ -82,11 +82,9 @@ struct MANGOS_DLL_DECL boss_archaedasAI : public ScriptedAI
 
     void JustDied(Unit* pKiller)
     {
-        if (!m_pInstance)
-            return;
-
         // open door to vault (handled by instance script)
-        m_pInstance->SetData(TYPE_ARCHAEDAS, DONE);
+        if (m_pInstance)
+            m_pInstance->SetData(TYPE_ARCHAEDAS, DONE);
     }
 
     void JustReachedHome()
diff --git a/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp b/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
@@ -71,10 +71,10 @@ void instance_uldaman::OnCreatureCreate(Creature* pCreature)
 {
     switch(pCreature->GetEntry())
     {
-        case MOB_HALLSHAPER:
-        case MOB_CUSTODIAN:
-        case MOB_GUARDIAN:
-        case MOB_VAULT_WARDER:
+        case NPC_HALLSHAPER:
+        case NPC_CUSTODIAN:
+        case NPC_GUARDIAN:
+        case NPC_VAULT_WARDER:
             m_lWardens.push_back(pCreature->GetGUID());
             pCreature->CastSpell(pCreature, SPELL_STONED, true);
             pCreature->SetNoCallAssistance(true);           // no assistance
@@ -240,15 +240,15 @@ Creature* instance_uldaman::GetClosestDwarfNotInCombat(Creature* pSearcher, uint
             switch(uiPhase)
             {
                 case PHASE_ARCHA_1:
-                    if (pTemp->GetEntry() != MOB_CUSTODIAN && pTemp->GetEntry() != MOB_HALLSHAPER)
+                    if (pTemp->GetEntry() != NPC_CUSTODIAN && pTemp->GetEntry() != NPC_HALLSHAPER)
                         continue;
                     break;
                 case PHASE_ARCHA_2:
-                    if (pTemp->GetEntry() != MOB_GUARDIAN)
+                    if (pTemp->GetEntry() != NPC_GUARDIAN)
                         continue;
                     break;
                 case PHASE_ARCHA_3:
-                    if (pTemp->GetEntry() != MOB_VAULT_WARDER)
+                    if (pTemp->GetEntry() != NPC_VAULT_WARDER)
                         continue;
                     break;
             }
diff --git a/scripts/eastern_kingdoms/uldaman/uldaman.h b/scripts/eastern_kingdoms/uldaman/uldaman.h
@@ -17,21 +17,17 @@ enum
     GO_TEMPLE_DOOR_LOWER        = 141869,
     GO_ANCIENT_VAULT            = 124369,
 
-    MOB_CUSTODIAN               = 7309,
-    MOB_HALLSHAPER              = 7077,
-    MOB_GUARDIAN                = 7076,
-    MOB_VAULT_WARDER            = 10120,
+    NPC_CUSTODIAN               = 7309,
+    NPC_HALLSHAPER              = 7077,
+    NPC_GUARDIAN                = 7076,
+    NPC_VAULT_WARDER            = 10120,
     NPC_STONE_KEEPER            = 4857,
 
     PHASE_ARCHA_1               = 1,
     PHASE_ARCHA_2               = 2,
     PHASE_ARCHA_3               = 3,
 
     SPELL_STONED                = 10255,
-    SPELL_USE_ALTAR_VISUAL      = 11206,
-
-    FACTION_TITAN_HOSTILE       = 415,
-    FACTION_TITAN_NEUTRAL       = 416,
 
     EVENT_ID_ALTAR_KEEPER       = 2228,                     // spell 11568
     EVENT_ID_ALTAR_ARCHAEDAS    = 2268                      // spell 10340
@@ -79,4 +75,5 @@ class MANGOS_DLL_DECL instance_uldaman : public ScriptedInstance
         std::list<uint64> m_lWardens;
         std::map<uint64, bool> m_mKeeperMap;
 };
+
 #endif
