From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 30 Jan 2011 16:37:36 +0000 (+0100)
Subject: Use relations_with() in getilists()
X-Git-Tag: v4.3.27~129
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=5245cde582b023d239ea52ac8825753bc04c1f5a

Use relations_with() in getilists()

No functional change, even though this changes rel[intruder] from
NEUTRAL to ALLIED.  Uses of rel[]:

* getilists() and ac_encounter() compare rel[cn] to HOSTILE.  No
  change, because NEUTRAL and ALLIED are both greater than HOSTILE.

* ac_encounter() compares rel[cn] to ALLIED, but only when cn !=
  plane_owner.  Because it passes plane_owner as argument for
  getilists() parameter intruder, rel[cn] can't refer to the changed
  element of rel[] here.

The new value of rel[plane_owner] permits simplifying cn ==
plane_owner || rel[cn] == ALLIED to just rel[cn] == ALLIED.
---

diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c
index 29df52f12..41d774e28 100644
--- a/src/lib/subs/aircombat.c
+++ b/src/lib/subs/aircombat.c
@@ -172,7 +172,7 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
 	if (!evaded) {
 	    overfly[sect.sct_own]++;
 	    for (cn = 1; cn < MAXNOC; cn++) {
-		if (cn == plane_owner || rel[cn] == ALLIED)
+		if (rel[cn] == ALLIED)
 		    continue;
 		if (cn != sect.sct_own && !gotships[cn] && !gotlands[cn])
 		    continue;
@@ -220,8 +220,6 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
 
     /* Let's report all of the overflights even if aborted */
     for (cn = 1; cn < MAXNOC; cn++) {
-	if (plane_owner == cn)
-	    continue;
 	if (overfly[cn] > 0 && rel[cn] != ALLIED)
 	    nreport(plane_owner, N_OVFLY_SECT, cn, overfly[cn]);
     }
@@ -762,7 +760,7 @@ getilists(struct emp_qelem *list, unsigned char *rel, natid intruder)
 
     rel[0] = NEUTRAL;
     for (cn = 1; cn < MAXNOC; cn++) {
-	rel[cn] = getrel(getnatp(cn), intruder);
+	rel[cn] = relations_with(cn, intruder);
 	emp_initque(&list[cn]);
     }