*Partially merge MaNGOS [8483] by bobaz (was mostly already implemented)

--HG--
branch : trunk
This commit is contained in:
maximius
2009-09-14 13:51:05 -07:00
parent 14a57a8b94
commit be63ad1016
+12 -11
View File
@@ -3628,26 +3628,27 @@ void AuraEffect::HandleAuraTransform(bool apply, bool Real, bool /*changeAmount*
CreatureInfo const * ci = objmgr.GetCreatureTemplate(GetMiscValue()); CreatureInfo const * ci = objmgr.GetCreatureTemplate(GetMiscValue());
if(!ci) if(!ci)
{ {
//pig pink ^_^ m_target->SetDisplayId(16358); // pig pink ^_^
m_target->SetDisplayId(16358);
sLog.outError("Auras: unknown creature id = %d (only need its modelid) Form Spell Aura Transform in Spell ID = %d", GetMiscValue(), GetId()); sLog.outError("Auras: unknown creature id = %d (only need its modelid) Form Spell Aura Transform in Spell ID = %d", GetMiscValue(), GetId());
} }
else else
{ {
// Will use the default model here uint32 model_id;
if (uint32 modelid = ci->GetRandomValidModelId())
m_target->SetDisplayId(modelid);
// Dragonmaw Illusion (set mount model also) if (uint32 modelid = ci->GetRandomValidModelId())
if(GetId()==42016 && m_target->GetMountID() && !m_target->GetAurasByType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED).empty()) model_id = modelid; // Will use the default model here
m_target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,16314);
// Polymorph (sheep) // Polymorph (sheep)
if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_MAGE && GetSpellProto()->SpellIconID == 82 && GetSpellProto()->SpellVisual[0] == 12978) if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_MAGE && GetSpellProto()->SpellIconID == 82 && GetSpellProto()->SpellVisual[0] == 12978)
if (Unit * caster = GetCaster()) if (Unit * caster = GetCaster())
// Glyph of the Penguin if (caster->HasAura(52648)) // Glyph of the Penguin
if (caster->HasAura(52648)) model_id = 26452;
m_target->SetDisplayId(26452);
m_target->SetDisplayId(model_id);
// Dragonmaw Illusion (set mount model also)
if(GetId()==42016 && m_target->GetMountID() && !m_target->GetAurasByType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED).empty())
m_target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,16314);
} }
} }