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

Use relations_with() for US==THEM || getrel(getnatp(US), THEM)

Browse source 
Replacing getrel(getnatp(US), THEM) by relations_with(US, THEM) makes
a difference only when US equals THEM.

Replace patterns like "us == them || getrel(getnatp(us), them)..." by
"relations_with(us, them)...".
This commit is contained in:
Markus Armbruster 2011-01-26 19:41:28 +01:00 • committed by Markus Armbruster
parent ef7b9cedc3
commit 8e75b22e0d
Notes: Markus Armbruster 2013-01-26 12:01:24 +01:00 
Author: Markus Armbruster <armbru@pond.sub.org>

Same guy, wrong e-mail address.
13 changed files with 25 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/update/plane.c
View file

@ -148,12 +148,10 @@ planerepair(struct plnstr *pp, struct natstr *np, struct bp *bp, int etus)
return;
if (carrier->shp_off)
return;
if ((carrier->shp_own != pp->pln_own) &&
(getrel(getnatp(carrier->shp_own), pp->pln_own) != ALLIED))
if (relations_with(carrier->shp_own, pp->pln_own) != ALLIED)
return;
} else {
if ((sp->sct_own != pp->pln_own) &&
(getrel(getnatp(sp->sct_own), pp->pln_own) != ALLIED))
if (relations_with(sp->sct_own, pp->pln_own) != ALLIED)
return;
}