coord ally;
int first = 1;
char mess[128];
- int rel;
*minmobp = 9876.0;
*maxmobp = -9876.0;
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 (relations_with(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));
next = qp->q_back;
llp = (struct ulist *)qp;
getsect(llp->unit.land.lnd_x, llp->unit.land.lnd_y, §);
- if (sect.sct_oldown == llp->unit.land.lnd_own)
- continue;
if (SCT_LANDMINES(§) == 0)
continue;
+ if (relations_with(sect.sct_oldown, llp->unit.land.lnd_own)
+ == ALLIED)
+ continue;
if (chance(DMINE_LHITCHANCE(sect.sct_mines) / (1 + 2 * with_eng))) {
lnd_hit_mine(&llp->unit.land);
sect.sct_mines--;
while (nxtsct(&ns, &fsect)) {
if (fsect.sct_own == 0)
continue;
- if (fsect.sct_own == victim)
- continue;
- if (getrel(getnatp(fsect.sct_own), victim) >= NEUTRAL)
+ if (relations_with(fsect.sct_own, victim) >= NEUTRAL)
continue;
range = roundrange(fortrange(&fsect));
trange = mapdist(newx, newy, fsect.sct_x, fsect.sct_y);
newx = xnorm(llp->unit.land.lnd_x + dx);
newy = ynorm(llp->unit.land.lnd_y + dy);
getsect(newx, newy, §);
- rel = getrel(getnatp(sect.sct_own), actor);
- if ((sect.sct_own != actor && rel != ALLIED &&
+ rel = relations_with(sect.sct_own, actor);
+ if ((rel != ALLIED &&
!(lchr[(int)llp->unit.land.lnd_type].l_flags & L_SPY) &&
sect.sct_own) || (sect.sct_type == SCT_WATER ||
sect.sct_type == SCT_SANCT ||
mpr(actor, "You no longer own %s\n",
xyas(osect.sct_x, osect.sct_y, actor));
}
- if (rel != ALLIED && sect.sct_own != actor && sect.sct_own) { /* must be a spy */
+ if (rel != ALLIED && sect.sct_own) { /* must be a spy */
/* Always a 10% chance of getting caught. */
if (chance(LND_SPY_DETECT_CHANCE(llp->unit.land.lnd_effic))) {
if (rel == NEUTRAL || rel == FRIENDLY) {
snxtitem_xy(&ni, EF_LAND, x, y);
while (nxtitem(&ni, &land)) {
- if (land.lnd_own != cn && getrel(getnatp(land.lnd_own), cn) != ALLIED)
+ if (relations_with(land.lnd_own, cn) != ALLIED)
continue;
if (lchr[(int)land.lnd_type].l_flags & L_ENGINEER)
return 1;