Permit ships to assault the sector they're in

Ships still have to be in a sea sector to assault an adjacent sector.
This commit is contained in:
Markus Armbruster 2008-04-24 20:38:57 +02:00
parent 0bdb80c4c9
commit a090b7878a

View file

@ -449,6 +449,7 @@ att_abort(int combat_mode, struct combat *off, struct combat *def)
if (att_get_combat(off, 0) < 0) if (att_get_combat(off, 0) < 0)
return abort_attack(); return abort_attack();
if (off->type == EF_SHIP && if (off->type == EF_SHIP &&
!(off->x == def->x && off->y == def->y) &&
(!getsect(off->x, off->y, &sect) || (!getsect(off->x, off->y, &sect) ||
sect.sct_type != SCT_WATER)) { sect.sct_type != SCT_WATER)) {
pr("%s can not %s from that far inland!\n", pr("%s can not %s from that far inland!\n",