empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use relations_with() in lnd_mar_one_sector()

Browse source 
No functional change, because the value of rel only matters when
sect.sct_own != actor, and then it's the same as before.

The new value of rel permits simplifying sect.sct_own != actor && rel
!= ALLIED to just rel != ALLIED.
This commit is contained in:
Markus Armbruster 2011-01-30 16:31:02 +01:00
parent 97543baadb
commit 6c893f5cc3
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/subs/lndsub.c
View file

@ -933,8 +933,8 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
newx = xnorm(llp->unit.land.lnd_x + dx);
newy = ynorm(llp->unit.land.lnd_y + dy);
getsect(newx, newy, &sect);
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 ||
@ -999,7 +999,7 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
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) {