Author: sveinung
Date: Fri Sep 23 00:43:26 2016
New Revision: 33856
URL: http://svn.gna.org/viewcvs/freeciv?rev=33856&view=rev
Log:
Help: check for the "Attack" action.
See patch #7713
Modified:
trunk/client/helpdata.c
Modified: trunk/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=33856&r1=33855&r2=33856&view=diff
==============================================================================
--- trunk/client/helpdata.c (original)
+++ trunk/client/helpdata.c Fri Sep 23 00:43:26 2016
@@ -1350,7 +1350,7 @@
_(" * Can attack units on non-native tiles.\n"));
}
/* Must use flag to distinguish from UTYF_MARINES text. */
- if (utype->attack_strength > 0
+ if (utype_can_do_action(utype, ACTION_ATTACK)
&& uclass_has_flag(pclass, UCF_ATT_FROM_NON_NATIVE)) {
CATLSTR(buf, bufsz,
_(" * Can launch attack from non-native tiles.\n"));
@@ -2133,7 +2133,7 @@
#if 0
/* Some units can never become veteran through combat in practice. */
bool veteran_through_combat =
- !((utype->attack_strength == 0
+ !((!utype_can_do_action(utype, ACTION_ATTACK)
|| uclass_has_flag(utype_class(utype), UCF_MISSILE))
&& utype->defense_strength == 0);
#endif
@@ -2144,7 +2144,7 @@
CATLSTR(buf, bufsz, _("* May acquire veteran status.\n"));
if (utype_veteran_has_power_bonus(utype)) {
if ((!utype_can_do_action(utype, ACTION_NUKE)
- && utype->attack_strength > 0)
+ && utype_can_do_action(utype, ACTION_ATTACK))
|| utype->defense_strength > 0) {
CATLSTR(buf, bufsz,
_(" * Veterans have increased strength in combat.\n"));
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
