Author: sveinung
Date: Thu Nov 27 15:36:53 2014
New Revision: 27137
URL: http://svn.gna.org/viewcvs/freeciv?rev=27137&view=rev
Log:
Revert bug #22381 fix
This makes rulesets where it is illegal to attack out of harbor possible again.
See bug #22794
Modified:
trunk/common/aicore/pf_tools.c
trunk/common/combat.c
Modified: trunk/common/aicore/pf_tools.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/aicore/pf_tools.c?rev=27137&r1=27136&r2=27137&view=diff
==============================================================================
--- trunk/common/aicore/pf_tools.c (original)
+++ trunk/common/aicore/pf_tools.c Thu Nov 27 15:36:53 2014
@@ -131,7 +131,7 @@
const struct pf_parameter *param)
{
if (PF_ACTION_ATTACK == action) {
- return ((PF_MS_NATIVE | PF_MS_CITY) & src_scope
+ return (PF_MS_NATIVE & src_scope
|| can_attack_from_non_native(param->utype));
} else if (PF_ACTION_DIPLOMAT == action) {
Modified: trunk/common/combat.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/combat.c?rev=27137&r1=27136&r2=27137&view=diff
==============================================================================
--- trunk/common/combat.c (original)
+++ trunk/common/combat.c Thu Nov 27 15:36:53 2014
@@ -133,7 +133,7 @@
}
/* 3. Can't attack with ground unit from ocean, except for marines */
- if (!can_exist_at_tile(unit_type(punit), unit_tile(punit))
+ if (!is_native_tile(unit_type(punit), unit_tile(punit))
&& !can_attack_from_non_native(unit_type(punit))) {
return ATT_NONNATIVE_SRC;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
