Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for automatic message suffixes #612

Merged
merged 1 commit into from May 25, 2016

Conversation

Yarn366
Copy link
Contributor

@Yarn366 Yarn366 commented May 23, 2016

This fixes the regression that caused all messages.tbl animation names to have a letter suffix appended, even if the base name referred to a valid animation file.

For more details, see this post: http://www.hard-light.net/forums/index.php?topic=91986.0

…mation exists. Also changed message_play_anim() to use this flag rather than the first_frame field to decide whether to add a suffix to the name.
@asarium asarium added the bug An issue from unintended consequences label May 23, 2016
@asarium
Copy link
Member

asarium commented May 23, 2016

The code looks good. Has it been tested that is actually fixes the issue (e.g. by ssmit132 who reported the issue)? If yes then it can be merged right away.
Once it's merged it should also be backported to 3.7.4.

@Yarn366
Copy link
Contributor Author

Yarn366 commented May 25, 2016

Both ssmit132 and I have verified that this fixes the problem.

@asarium
Copy link
Member

asarium commented May 25, 2016

Great, I'll merge this then.
Could you also open a PR for 3.7.4? This is a bugfix that should definitely be in the release version.

@asarium asarium merged commit 1a59a1c into scp-fs2open:master May 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug An issue from unintended consequences
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants