mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-20 16:37:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10373] Drop unused team-argument in ChooseDisplayId -function

Browse source 
Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-08-18 18:09:21 +02:00
parent a17450047b
commit a15b0916b6
7 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/game/SpellAuras.cpp
View file

@ -1971,7 +1971,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
// we must assume db or script set display id to native at ending flight (if not, target is stuck with this model)
if (cInfo)
target->SetDisplayId(Creature::ChooseDisplayId(0, cInfo));
target->SetDisplayId(Creature::ChooseDisplayId(cInfo));
return;
}
@ -2680,11 +2680,7 @@ void Aura::HandleAuraMounted(bool apply, bool Real)
return;
}
uint32 team = 0;
if (target->GetTypeId()==TYPEID_PLAYER)
team = ((Player*)target)->GetTeam();
uint32 display_id = Creature::ChooseDisplayId(team,ci);
uint32 display_id = Creature::ChooseDisplayId(ci);
CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelRandomGender(display_id);
if (minfo)
display_id = minfo->modelid;
@ -3114,7 +3110,7 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
sLog.outError("Auras: unknown creature id = %d (only need its modelid) Form Spell Aura Transform in Spell ID = %d", m_modifier.m_miscvalue, GetId());
}
else
model_id = Creature::ChooseDisplayId(0,ci); // Will use the default model here
model_id = Creature::ChooseDisplayId(ci); // Will use the default model here
// Polymorph (sheep/penguin case)
if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_MAGE && GetSpellProto()->SpellIconID == 82)
@ -3186,11 +3182,7 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
uint32 cr_id = target->GetAurasByType(SPELL_AURA_MOUNTED).front()->GetModifier()->m_miscvalue;
if (CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(cr_id))
{
uint32 team = 0;
if (target->GetTypeId() == TYPEID_PLAYER)
team = ((Player*)target)->GetTeam();
uint32 display_id = Creature::ChooseDisplayId(team, ci);
uint32 display_id = Creature::ChooseDisplayId(ci);
CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelRandomGender(display_id);
if (minfo)
display_id = minfo->modelid;