recruit dialog: Gray out units that will not be able to be recruited #4444
Conversation
This file contains 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
|
Testing An Orcish Incursion S5 as mentioned in #4443 and your branch name, this seems to do what is intended. |
|
Thanks for the review! |
jostephd
added
the
Ready for testing
stevecotton
reviewed
Oct 14, 2019
src/gui/dialogs/unit_recruit.hpp
Outdated
| @@ -27,11 +27,13 @@ namespace dialogs | |||
| class unit_recruit : public modal_dialog | |||
| { | |||
| public: | |||
| unit_recruit(std::vector<const unit_type*>& recruit_list, team& team); | |||
| /// @param recruit_list maps unit typs to strings. The strings are "" | |||
There was a problem hiding this comment.
There's no param called recruit_list.
Should it map to t_string instead of string?
There was a problem hiding this comment.
There's no param called
recruit_list.
Fixed
Should it map to t_string instead of string?
What difference would that make?
Thanks for the review!
There was a problem hiding this comment.
I feel t_string makes it obvious that it's a string for showing to the user, because it's explicitly translatable.
There was a problem hiding this comment.
Done. Anything else before merging?
jostephd
force-pushed
the
recruit-extrarecruit-gray-AOI-S5
branch
from
424d446
to
bc4613d
Compare
Reproducible in WoV S3 by recruiting a unit and trying to repeat the recruit. Previously it failed silently, now it shows a message.
jostephd
force-pushed
the
recruit-extrarecruit-gray-AOI-S5
branch
from
bc4613d
to
129e53b
Compare
jostephd
added a commit
that referenced
this pull request
Oct 16, 2019
Closed
jostephd
moved this from issues
to merged
in Show unrecruitable/unrecallable units in gray
Wedge009
pushed a commit
to Wedge009/wesnoth
that referenced
this pull request
Nov 12, 2019
(cherry picked from commit 70a2046)
Wedge009
pushed a commit
to Wedge009/wesnoth
that referenced
this pull request
Nov 13, 2019
(cherry picked from commit 70a2046)
Wedge009
pushed a commit
that referenced
this pull request
Nov 13, 2019
(cherry picked from commit 70a2046)
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.
Fixes #4443. This doesn't add or remove any units to the recruit dialog, it simply makes units that will fail to be recruited be listed in gray.
See the individual commits for details.