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

recruit dialog: Gray out units that will not be able to be recruited #4444

Merged
merged 8 commits into from Oct 16, 2019

Conversation

@jostephd
Copy link
Member

jostephd commented Oct 10, 2019

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.

@jostephd jostephd self-assigned this Oct 10, 2019
@Wedge009

This comment has been minimized.

Copy link
Member

Wedge009 commented Oct 10, 2019

Testing An Orcish Incursion S5 as mentioned in #4443 and your branch name, this seems to do what is intended.

@jostephd

This comment has been minimized.

Copy link
Member Author

jostephd commented Oct 10, 2019

Thanks for the review!

@@ -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 ""

This comment has been minimized.

Copy link
@stevecotton

stevecotton Oct 14, 2019

Contributor

There's no param called recruit_list.

Should it map to t_string instead of string?

This comment has been minimized.

Copy link
@jostephd

jostephd Oct 14, 2019

Author Member

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!

This comment has been minimized.

Copy link
@stevecotton

stevecotton Oct 14, 2019

Contributor

I feel t_string makes it obvious that it's a string for showing to the user, because it's explicitly translatable.

This comment has been minimized.

Copy link
@jostephd

jostephd Oct 15, 2019

Author Member

Done. Anything else before merging?

src/gui/dialogs/unit_recruit.hpp Outdated Show resolved Hide resolved
@jostephd

This comment has been minimized.

Copy link
Member Author

jostephd commented Oct 14, 2019

The conflict is trivial, caused by @sevu's 0dc80ec. I'll fix it as part of merging.

@jostephd jostephd force-pushed the jostephd:recruit-extrarecruit-gray-AOI-S5 branch from 424d446 to bc4613d Oct 16, 2019
@jostephd jostephd force-pushed the jostephd:recruit-extrarecruit-gray-AOI-S5 branch from bc4613d to 129e53b Oct 16, 2019
jostephd added a commit that referenced this pull request Oct 16, 2019
@jostephd jostephd merged commit 129e53b into wesnoth:master Oct 16, 2019
0 of 2 checks passed
0 of 2 checks passed
Travis CI - Pull Request Build Created
Details
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
@jostephd jostephd referenced this pull request Oct 16, 2019
Wedge009 added a commit to Wedge009/wesnoth that referenced this pull request Nov 12, 2019
(cherry picked from commit 70a2046)
Wedge009 added a commit to Wedge009/wesnoth that referenced this pull request Nov 13, 2019
(cherry picked from commit 70a2046)
Wedge009 added 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
3 participants
You can’t perform that action at this time.