From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 29 Jan 2011 12:09:26 +0000 (+0100)
Subject: Eliminate a few pointless relations variables
X-Git-Tag: v4.3.27~138
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=7ebbe7da4c20c5b505790c7e5fc755858fc00d81

Eliminate a few pointless relations variables

Just to make the next few commits easier to review.
---

diff --git a/src/lib/commands/atta.c b/src/lib/commands/atta.c
index a327e7646..c993fd636 100644
--- a/src/lib/commands/atta.c
+++ b/src/lib/commands/atta.c
@@ -60,7 +60,6 @@ atta(void)
     int last, n;
     char *p;
     char buf[1024];
-    int rel;
 
     att_combat_init(def, EF_SECTOR);
     /*
@@ -95,8 +94,8 @@ atta(void)
 	newx = def->x + diroff[n + 1][0];
 	newy = def->y + diroff[n + 1][1];
 	getsect(newx, newy, &sect);	/* incase cross world boundary */
-	rel = getrel(getnatp(sect.sct_own), player->cnum);
-	if (!player->owner && rel != ALLIED)
+	if (!player->owner
+	    && getrel(getnatp(sect.sct_own), player->cnum) != ALLIED)
 	    continue;
 	att_combat_init(&off[++last], EF_SECTOR);
 	off[last].x = sect.sct_x;
diff --git a/src/lib/commands/upgr.c b/src/lib/commands/upgr.c
index 76780e022..2d4c38c04 100644
--- a/src/lib/commands/upgr.c
+++ b/src/lib/commands/upgr.c
@@ -84,7 +84,6 @@ lupgr(void)
     int n;
     int tlev;
     int avail, cost;
-    int rel;
     long cash;
 
     if (!snxtitem(&ni, EF_LAND, player->argp[2], NULL))
@@ -101,8 +100,8 @@ lupgr(void)
 	    continue;
 	if (sect.sct_type != SCT_HEADQ || sect.sct_effic < 60)
 	    continue;
-	rel = getrel(getnatp(land.lnd_own), sect.sct_own);
-	if (rel < FRIENDLY && sect.sct_own != land.lnd_own) {
+	if (getrel(getnatp(land.lnd_own), sect.sct_own) < FRIENDLY
+	    && sect.sct_own != land.lnd_own) {
 	    pr("You are not on friendly terms with the owner of unit %d!\n",
 	       land.lnd_uid);
 	    continue;
@@ -166,7 +165,6 @@ supgr(void)
     int n;
     int tlev;
     int avail, cost;
-    int rel;
     long cash;
 
     if (!snxtitem(&ni, EF_SHIP, player->argp[2], NULL))
@@ -183,8 +181,8 @@ supgr(void)
 	    continue;
 	if (sect.sct_type != SCT_HARBR || sect.sct_effic < 60)
 	    continue;
-	rel = getrel(getnatp(ship.shp_own), sect.sct_own);
-	if (rel < FRIENDLY && sect.sct_own != ship.shp_own) {
+	if (getrel(getnatp(ship.shp_own), sect.sct_own) < FRIENDLY
+	    && sect.sct_own != ship.shp_own) {
 	    pr("You are not on friendly terms with the owner of ship %d!\n",
 	       ship.shp_uid);
 	    continue;
@@ -247,7 +245,6 @@ pupgr(void)
     int n;
     int tlev;
     int avail, cost;
-    int rel;
     long cash;
 
     if (!snxtitem(&ni, EF_PLANE, player->argp[2], NULL))
@@ -264,8 +261,8 @@ pupgr(void)
 	    continue;
 	if (sect.sct_type != SCT_AIRPT || sect.sct_effic < 60)
 	    continue;
-	rel = getrel(getnatp(plane.pln_own), sect.sct_own);
-	if (rel < FRIENDLY && sect.sct_own != plane.pln_own) {
+	if (getrel(getnatp(plane.pln_own), sect.sct_own) < FRIENDLY
+	    && sect.sct_own != plane.pln_own) {
 	    pr("You are not on friendly terms with the owner of plane %d!\n",
 	       plane.pln_uid);
 	    continue;
diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c
index c003bceb8..2645eb69e 100644
--- a/src/lib/subs/aircombat.c
+++ b/src/lib/subs/aircombat.c
@@ -603,7 +603,6 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
     struct mchrstr *mcp;
     double flak, total, ngun;
     int gun;
-    int rel;
     struct plist *plp;
     natid plane_owner;
     natid from;
@@ -619,8 +618,7 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
 	mcp = &mchr[(int)ship.shp_type];
 	if (mcp->m_flags & M_SUB)
 	    continue;
-	rel = getrel(getnatp(ship.shp_own), plane_owner);
-	if (rel > HOSTILE)
+	if (getrel(getnatp(ship.shp_own), plane_owner) > HOSTILE)
 	    continue;
 	gun = shp_usable_guns(&ship);
 	if (gun == 0)
@@ -653,7 +651,6 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
     struct lchrstr *lcp;
     double flak, total, ngun;
     int aaf, gun;
-    int rel;
     struct plist *plp;
     natid plane_owner;
     natid from;
@@ -672,8 +669,7 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
 	    continue;
 	if (land.lnd_ship >= 0 || land.lnd_land >= 0)
 	    continue;
-	rel = getrel(getnatp(land.lnd_own), plane_owner);
-	if (rel > HOSTILE)
+	if (getrel(getnatp(land.lnd_own), plane_owner) > HOSTILE)
 	    continue;
 	flak = aaf * 1.5 * land.lnd_effic / 100.0;
 	ngun += flak;
diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index 35ecaec35..f35116ca6 100644
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -468,7 +468,6 @@ lnd_mar(struct emp_qelem *list, double *minmobp, double *maxmobp,
     coord ally;
     int first = 1;
     char mess[128];
-    int rel;
 
     *minmobp = 9876.0;
     *maxmobp = -9876.0;
@@ -502,8 +501,8 @@ lnd_mar(struct emp_qelem *list, double *minmobp, double *maxmobp,
 	    lnd_stays(actor, "has no mil on it to guide it", llp);
 	    continue;
 	}
-	rel = getrel(getnatp(sect.sct_own), actor);
-	if (sect.sct_own != land.lnd_own && rel != ALLIED &&
+	if (sect.sct_own != land.lnd_own &&
+	    getrel(getnatp(sect.sct_own), actor) != ALLIED &&
 	    !(lchr[(int)llp->unit.land.lnd_type].l_flags & L_SPY) &&
 	    sect.sct_own) {
 	    sprintf(mess, "has been kidnapped by %s", cname(sect.sct_own));
diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index 38edf91a6..e0db61943 100644
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -263,15 +263,12 @@ shiprepair(struct shpstr *ship, struct natstr *np, struct bp *bp, int etus)
     int w_p_eff;
     int mult;
     int mvec[I_MAX + 1];
-    int rel;
 
     mp = &mchr[(int)ship->shp_type];
     sp = getsectp(ship->shp_x, ship->shp_y);
 
     if ((sp->sct_own != ship->shp_own) && (sp->sct_own != 0)) {
-	rel = getrel(getnatp(sp->sct_own), ship->shp_own);
-
-	if (rel < FRIENDLY)
+	if (getrel(getnatp(sp->sct_own), ship->shp_own) < FRIENDLY)
 	    return;
     }