Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions common/world/objects/npc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,10 @@ Tempest::Vec3 Npc::animMoveSpeed(uint64_t dt) const {
}

void Npc::setVisual(const Skeleton* v) {
if(visual.visualSkeleton()==v)
return;
visual.setVisual(v);
visual.clearOverlays();
invalidateTalentOverlays();
}

Expand Down Expand Up @@ -3229,7 +3232,6 @@ void Npc::commitSpell() {
if(spellInfo!=0 && transformSpl==nullptr) {
transformSpl.reset(new TransformBack(*this));
invent.updateView(*this);
visual.clearOverlays();

owner.script().initializeInstanceNpc(hnpc, size_t(spellInfo));
spellInfo = 0;
Expand Down Expand Up @@ -4508,10 +4510,6 @@ void Npc::transformBack() {
setVisualBody(vHead,vTeeth,vColor,bdColor,body,head);
closeWeapon(true);

// invalidate tallent overlays
for(size_t i=0; i<TALENT_MAX_G2; ++i)
setTalentSkill(Talent(i),talentsSk[i]);

invent.updateView(*this);
transformSpl.reset();
}
Expand Down
Loading