[SP] Fix animation events not playing for certain npc variants#1333
Open
TwelveEyes wants to merge 1 commit into
Open
[SP] Fix animation events not playing for certain npc variants#1333TwelveEyes wants to merge 1 commit into
TwelveEyes wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The original code works off the assumption that
NPC_typewill always match theplayerModel. This is okay for most cases, but obviously doesn't work for the stormtrooper variants (e.g.NPC_typestormtrooper2does not matchplayerModelstormtrooper). Because of this, the variants do not get stormtrooperanimeventsapplied to them. Passing along theNPC_typetoG_ParseAnimationEvtFileto record as themodelIndexfixes this (NPC_type.handle()will then correctly equal themodelOnlyshort).PR #1310 does not fix the issue, and in fact breaks the
animeventsfor the non-variantstormtrooper.Fixes #1287