From 23d52a41478918361141a12c3f7bb55caeecbe1d Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 6 Jul 2008 15:19:17 -0400 Subject: [PATCH] Fix bomb not to let you p-bomb dead ships and land units ASW planes bombing ships were not affected, because asw_shipsatxy() excludes dead ships correctly. --- src/lib/commands/bomb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c index 5350a0a3c..975ca7687 100644 --- a/src/lib/commands/bomb.c +++ b/src/lib/commands/bomb.c @@ -512,8 +512,8 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target) continue; if ((plp->pcp->pl_flags & P_A) && !on_shiplist(n, head)) continue; - if (getship(n, &ship) && ship.shp_x == target->sct_x && - ship.shp_y == target->sct_y) + if (getship(n, &ship) && ship.shp_own && + ship.shp_x == target->sct_x && ship.shp_y == target->sct_y) shipno = n; } if (shipno < 0) @@ -743,7 +743,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target) n = atoi(q); if (n < 0) continue; - if (getland(n, &land) && + if (getland(n, &land) && land.lnd_own && land.lnd_x == target->sct_x && land.lnd_y == target->sct_y) unitno = n; else -- 2.43.0