Permit ships to assault the sector they're in

Ships still have to be in a sea sector to assault an adjacent sector.

diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c
index 5183b2a5a7f0d3b668c325cc3fd0d1cbd33a8b75..d3d6c5c3048a9f9f7a5e7e75ce0cba1e0a1030ec 100644 (file)
--- a/src/lib/subs/attsub.c
+++ b/src/lib/subs/attsub.c
@@ -461,6 +461,7 @@ att_abort(int combat_mode, struct combat *off, struct combat *def)
        if (att_get_combat(off, 0) < 0)
            return abort_attack();
        if (off->type == EF_SHIP &&
        if (att_get_combat(off, 0) < 0)
            return abort_attack();
        if (off->type == EF_SHIP &&

+           !(off->x == def->x && off->y == def->y) &&

            (!getsect(off->x, off->y, &sect) ||
             sect.sct_type != SCT_WATER)) {
            pr("%s can not %s from that far inland!\n",
            (!getsect(off->x, off->y, &sect) ||
             sect.sct_type != SCT_WATER)) {
            pr("%s can not %s from that far inland!\n",