diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c index 11616ee9..106b7977 100644 --- a/src/lib/subs/aircombat.c +++ b/src/lib/subs/aircombat.c @@ -770,12 +770,18 @@ ac_doflak(struct emp_qelem *list, struct sctstr *from) gun = MIN(FLAK_GUN_MAX, from->sct_item[I_GUN]); shell = from->sct_item[I_SHELL]; +#if 0 + /* + * FIXME can supply from itself, causing seqno mismatch oops + * further down + */ if (gun > shell * 2) { shell += supply_commod(from->sct_own, from->sct_x, from->sct_y, I_SHELL, (gun + 1) / 2 - shell); from->sct_item[I_SHELL] = shell; putsect(from); } +#endif if (gun > shell * 2) gun = shell * 2; diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c index 7ceebb7a..bcdd5869 100644 --- a/src/lib/subs/shpsub.c +++ b/src/lib/subs/shpsub.c @@ -867,12 +867,18 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget) shell = ship.shp_item[I_SHELL]; if (ship.shp_item[I_MILIT] < 1) /* do we have mil? */ continue; +#if 0 + /* + * FIXME can supply from itself, causing seqno mismatch oops + * further down + */ if (shell < 2) { /* do we need shells */ shell += supply_commod(ship.shp_own, ship.shp_x, ship.shp_y, I_SHELL, 2); if (shell < 2) continue; } +#endif if (ship.shp_item[I_GUN] < 1) /* we need at least 1 gun */ continue;