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/scra.c
View file

@ -135,7 +135,7 @@ scra(void)
getsect(item.gen.x, item.gen.y, &sect);
if (type == EF_SHIP) {
if (!player->owner
&& getrel(getnatp(sect.sct_own), player->cnum) < FRIENDLY) {
&& relations_with(sect.sct_own, player->cnum) < FRIENDLY) {
pr("%s is not in a friendly harbor!\n",
prship(&item.ship));
continue;
@ -158,7 +158,7 @@ scra(void)
}
} else {
if (!player->owner
&& getrel(getnatp(sect.sct_own), player->cnum) != ALLIED) {
&& relations_with(sect.sct_own, player->cnum) != ALLIED) {
pr("%s is not in an allied sector!\n",
obj_nameof(&item.gen));
continue;