*Fix some sd2 merge errors (boss_kaelthas.cpp left).

--HG--
branch : trunk

src/bindings/scripts/scripts/creature/mob_event_ai.cpp

@@ -608,10 +608,8 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI
                         if (CreatureInfo const* ci = GetCreatureTemplateStore(param1))
                         {
                             //use default display
-							//TODO FIX DisplayID_A in core
-							/*
-                            if (ci->DisplayID_A)
-                                m_creature->SetDisplayId(ci->DisplayID_A);*/
+                            if (ci->Modelid1)
+                                m_creature->SetDisplayId(ci->Modelid1);
                         }
                     }
                     //if no param1, then use value from param2 (modelId)

src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp

@@ -104,8 +104,7 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI
 
     void SpellHit(Unit *Caster, const SpellEntry *Spell)
     {
-	// error: âconst struct SpellEntryâ has no member named âSpellFamilyFlags2â
-        /*if (Spell->SpellFamilyFlags2 & 0x080000000)
+        if (Spell->SpellFamilyFlags[2] & 0x080000000)
         {
             m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
             m_creature->SetStandState(UNIT_STAND_STATE_STAND);
@@ -115,7 +114,7 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI
             pCaster = Caster->GetGUID();
 
             SayThanksTimer = 5000;
-        }*/
+        }
     }
 
     void UpdateAI(const uint32 diff)

src/game/SpellAuras.cpp

@@ -461,7 +461,7 @@ Aura::~Aura()
     //Delete references to aura
     if(GetAuraSlot() < MAX_AURAS && m_target && m_target->GetVisibleAura(GetAuraSlot()))
     {
-        AuraSlotEntry * entry = m_target->GetVisibleAura(GetAuraSlot());
+        if (AuraSlotEntry * entry = m_target->GetVisibleAura(GetAuraSlot()));
             entry->m_slotAuras[GetEffIndex()]=NULL;
     }
 }