From 2030decb99b47dbab307990d3277333e9ecae926 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 21 Sep 2008 11:02:10 -0400 Subject: [PATCH] Make planes report non-hostile ships and lands in target sector Before, ac_encounter() reported only ships and land units hostile to the planes. --- src/lib/subs/aircombat.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c index 10079cec..66d8841a 100644 --- a/src/lib/subs/aircombat.c +++ b/src/lib/subs/aircombat.c @@ -296,20 +296,18 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list, /* Are there ships owned by this country? */ if (nats[cn] != 0) { /* Yes. */ - if (cn != 0) { - PR(cn, "%s planes spotted over ships in %s\n", - cname(plane_owner), xyas(x, y, cn)); - if (opt_HIDDEN) - setcont(cn, plane_owner, FOUND_FLY); - } + PR(plane_owner, "Flying over %s ships in %s\n", + cname(cn), xyas(x, y, plane_owner)); + PR(cn, "%s planes spotted over ships in %s\n", + cname(plane_owner), xyas(x, y, cn)); + if (opt_HIDDEN) + setcont(cn, plane_owner, FOUND_FLY); if (unfriendly[cn]) { /* They are unfriendly too */ if (!gotilist[cn]) { getilist(&ilist[cn], cn); gotilist[cn]++; } - PR(plane_owner, "Flying over %s ships in %s\n", - cname(cn), xyas(x, y, plane_owner)); /* This makes going for ships in harbors tough */ if (!evaded) { /* We already fired flak up above. Now we intercept again if we haven't already */ @@ -324,20 +322,18 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list, /* Are there units owned by this country? */ if (lnats[cn] != 0) { /* Yes. */ - if (cn != 0) { - PR(cn, "%s planes spotted over land units in %s\n", - cname(plane_owner), xyas(x, y, cn)); - if (opt_HIDDEN) - setcont(cn, plane_owner, FOUND_FLY); - } + PR(plane_owner, "Flying over %s land units in %s\n", + cname(cn), xyas(x, y, plane_owner)); + PR(cn, "%s planes spotted over land units in %s\n", + cname(plane_owner), xyas(x, y, cn)); + if (opt_HIDDEN) + setcont(cn, plane_owner, FOUND_FLY); if (unfriendly[cn]) { /* They are unfriendly too */ if (!gotilist[cn]) { getilist(&ilist[cn], cn); gotilist[cn]++; } - PR(plane_owner, "Flying over %s land units in %s\n", - cname(cn), xyas(x, y, plane_owner)); if (!evaded) { if (intown == -1) { /* We haven't intercepted yet, so intercept */