Author: sveinung
Date: Mon Apr 10 14:14:36 2017
New Revision: 35218
URL: http://svn.gna.org/viewcvs/freeciv?rev=35218&view=rev
Log:
Homogenize ustate unit action cache creator.
Make the unit state unit action cache creator function more like the other
unit action cache creators by moving the setting of ACTION_ANY below the
setting of ACTION_HOSTILE.
See hrm Feature #650568
Modified:
branches/S3_0/common/unittype.c
Modified: branches/S3_0/common/unittype.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/common/unittype.c?rev=35218&r1=35217&r2=35218&view=diff
==============================================================================
--- branches/S3_0/common/unittype.c (original)
+++ branches/S3_0/common/unittype.c Mon Apr 10 14:14:36 2017
@@ -403,9 +403,6 @@
/* Not required to be absent, so OK if present */
req.present = FALSE;
if (!is_req_in_vec(&req, &(enabler->actor_reqs))) {
- BV_SET(ustate_act_cache[utype_index(putype)][ACTION_ANY],
- requirement_unit_state_ereq(req.source.value.unit_state,
- TRUE));
BV_SET(ustate_act_cache[utype_index(putype)][enabler->action],
requirement_unit_state_ereq(req.source.value.unit_state,
TRUE));
@@ -414,14 +411,14 @@
requirement_unit_state_ereq(req.source.value.unit_state,
TRUE));
}
+ BV_SET(ustate_act_cache[utype_index(putype)][ACTION_ANY],
+ requirement_unit_state_ereq(req.source.value.unit_state,
+ TRUE));
}
/* Not required to be present, so OK if absent */
req.present = TRUE;
if (!is_req_in_vec(&req, &(enabler->actor_reqs))) {
- BV_SET(ustate_act_cache[utype_index(putype)][ACTION_ANY],
- requirement_unit_state_ereq(req.source.value.unit_state,
- FALSE));
BV_SET(ustate_act_cache[utype_index(putype)][enabler->action],
requirement_unit_state_ereq(req.source.value.unit_state,
FALSE));
@@ -430,6 +427,9 @@
requirement_unit_state_ereq(req.source.value.unit_state,
FALSE));
}
+ BV_SET(ustate_act_cache[utype_index(putype)][ACTION_ANY],
+ requirement_unit_state_ereq(req.source.value.unit_state,
+ FALSE));
}
}
} action_enablers_iterate_end;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
