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

miscellaneous XSTR cleanup #2105

Merged
merged 9 commits into from Oct 14, 2019
Merged

Conversation

@Goober5000
Copy link
Contributor

Goober5000 commented Oct 12, 2019

The grant-medal and was-medal-granted sexps will now translate medal names, in the same way that tech-add-intel-xstr translates intel entries. There is also some minor cleanup and the specifying of correct default -1 numbers for the xstr-capable sexps.

This fixes #1285.

With Novachen's comment, this PR drops the modifications to grant-medal and was-medal-granted, and just does some cleanup with XSTR and CTEXT.

Goober5000 added 3 commits Oct 12, 2019
The grant-medal and was-medal-granted sexps will now translate medal names, in the same way that tech-add-intel-xstr translates intel entries.  There is also some minor cleanup and the specifying of correct default -1 numbers for the xstr-capable sexps.
@NovachenFS2

This comment has been minimized.

Copy link
Contributor

NovachenFS2 commented Oct 12, 2019

Mh, is this actually needed? I mean, Medal names can be translated with $Alt Name: in the medals.tbl, now.
This feature was implemented on my request in #1736.

@Goober5000

This comment has been minimized.

Copy link
Contributor Author

Goober5000 commented Oct 12, 2019

In that case, #1285 should have been closed. I had the impression that #1736 did not fix the medal issue. I will close that now.

However I will modify this PR because there are a few miscellaneous fixes that should be added to the code.

@Goober5000 Goober5000 changed the title add xstr capability for medals miscellaneous XSTR cleanup Oct 12, 2019
@Goober5000 Goober5000 added the cleanup label Oct 12, 2019
Goober5000 added 2 commits Oct 12, 2019
code/parse/sexp.cpp Outdated Show resolved Hide resolved
@Goober5000 Goober5000 merged commit 7703b27 into scp-fs2open:master Oct 14, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Goober5000 Goober5000 deleted the Goober5000:grant_medal_xstr branch Oct 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.