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

Use relations_with() for getrel(getnatp(US), THEM) where US!=THEM

Browse source 
Replacing getrel(getnatp(US), THEM) by relations_with(US, THEM) makes
a difference only when US equals THEM.  Replace in places where it's
obvious that they're not equal.

Note: getsect() sets player->owner to "player is god or owns this
sector".  Thus, after getsect(..., &sect), sect.sct_own ==
player->cnum implies player->owner.  Conversely, !player->owner
implies sect.sct_own != player->cnum.  Similarly for getship(),
getplane() and nxtitem().
This commit is contained in:
Markus Armbruster 2011-01-29 14:34:40 +01:00
parent 6807cd91b5
commit 8cb7b75557
10 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/commands/arm.c
View file

@ -59,7 +59,7 @@ arm(void)
return RET_SYN;
while (nxtitem(&ni, &pl)) {
if (!player->owner
&& getrel(getnatp(pl.pln_own), player->cnum) != ALLIED)
&& relations_with(pl.pln_own, player->cnum) != ALLIED)
continue;
plc = &plchr[(int)pl.pln_type];
if ((plc->pl_flags & (P_O | P_N | P_MAR))
@ -150,7 +150,7 @@ disarm(void)
}
getsect(nuke.nuk_x, nuke.nuk_y, &sect);
if (!player->owner
&& getrel(getnatp(sect.sct_own), player->cnum) != ALLIED) {
&& relations_with(sect.sct_own, player->cnum) != ALLIED) {
pr("Disarming %s in sector %s requires an alliance!\n",
prplane(&pl), xyas(sect.sct_x, sect.sct_y, player->cnum));
continue;