upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 14:51:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add an error message...

Browse Source 
...for the case where a recruit does not match any recruit lists.

This should never happen, but if it does, it could be helpful to have
the error message distinguish this case from not having an eligible
leader on a keep.
This commit is contained in:
J. Tyne 2013-02-07 18:24:31 +00:00
parent eb1f002e81
commit 9ddc8c4459
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/actions/create.cpp
View File

@ -549,7 +549,7 @@ std::string find_recall_location(const int side, map_location& recall_loc, map_l
if (leader_able == u_end) {
LOG_NG << "No Leader able to recall unit: " << recall_unit.id() << " on side " << side << '\n';
return _("None of your leaders is able to recall that unit.");
return _("None of your leaders are able to recall that unit.");
}
if (leader_keep == u_end) {
@ -631,8 +631,13 @@ std::string find_recruit_location(const int side, map_location& recruit_location
return _("You don’t have a leader to recruit with.");
}
if (leader_able == u_end) {
LOG_NG << "No leader able to recruit '" << unit_type << "' on side " << side << '\n';
return _("None of your leaders are able to recruit that unit.");
}
if (leader_keep == u_end) {
LOG_NG << "Leader not on start: leader is on " << leader->get_location() << '\n';
LOG_NG << "Leader not on keep: able leader is on " << leader_able->get_location() << '\n';
return _("You must have a leader on a keep who is able to recruit the unit.");
}