From 928e9a4cc3552ded6d673e5e915e61656c484db6 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 1 Feb 2011 07:49:32 +0100 Subject: [PATCH] Use relations_with() in unit_interdict() No functional change, because the value of rel only matters when cn != victim, and then it's the same as before. The new value of rel permits simplifying cn != victim && rel <= NEUTRAL to just rel <= NEUTRAL --- src/lib/subs/mission.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c index bd612cc5..35652347 100644 --- a/src/lib/subs/mission.c +++ b/src/lib/subs/mission.c @@ -187,10 +187,10 @@ unit_interdict(coord x, coord y, natid victim, char *s, int hardtarget, memset(mi, 0, sizeof(mi)); other_act[0] = plane_act[0] = 0; for (cn = 1; cn < MAXNOC; cn++) { - rel = getrel(getnatp(cn), victim); + rel = relations_with(cn, victim); other_act[cn] = rel <= HOSTILE; plane_act[cn] = mission == MI_SINTERDICT - ? cn != victim && rel <= NEUTRAL : other_act[cn]; + ? rel <= NEUTRAL : other_act[cn]; emp_initque((struct emp_qelem *)&mi[cn]); }