Skip to content

Clear animation overlay on transform spell end - #1013

Merged
Try merged 2 commits into
Try:masterfrom
thokkat:transform-spell
Oct 13, 2026
Merged

Try merged 2 commits into
Try:masterfrom
thokkat:transform-spell

Conversation

@thokkat

@thokkat thokkat commented Oct 10, 2026

Copy link
Copy Markdown
Collaborator

Monster Overlays aren't cleared if transformed back to human. Found in save from #984.

To reproduce transform to firewaran and back. Use forward jump attack in fistmode.

@Try Try left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks for PR @thokkat !
As mentioned in review comment: I think overlay handling should be part of setVisual.
And call to setTalentSkill then wont be needed.

Comment thread common/world/objects/npc.cpp Outdated
closeWeapon(true);

// invalidate tallent overlays
visual.clearOverlays();

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should it be part of Npc::setVisual rather? setVisual already handles remapping of 'tallent'-overlays and might as well clear overlays upfront

@thokkat

thokkat commented Oct 11, 2026

Copy link
Copy Markdown
Collaborator Author

Done.

@Try

Try commented Oct 12, 2026

Copy link
Copy Markdown
Owner

@thokkat
I've added a minor change, to avoid clears for nop-calls of mdl_setvisual. If no objections - ready to merge

@thokkat

thokkat commented Oct 13, 2026

Copy link
Copy Markdown
Collaborator Author

Looks good for merge.

@Try
Try merged commit 4765c90 into Try:master Oct 13, 2026
5 of 8 checks passed
@Try

Try commented Oct 13, 2026

Copy link
Copy Markdown
Owner

Merged, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants