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

8
src/lib/commands/load.c
View file

@ -117,7 +117,7 @@ load(void)
if (!player->owner) {
if (load_unload == UNLOAD || !noisy)
continue;
if (getrel(getnatp(ship.shp_own), player->cnum) < FRIENDLY)
if (relations_with(ship.shp_own, player->cnum) < FRIENDLY)
continue;
}
@ -145,7 +145,7 @@ load(void)
}
if (load_unload == UNLOAD
&& !player->owner
&& getrel(getnatp(sect.sct_own), player->cnum) < FRIENDLY) {
&& relations_with(sect.sct_own, player->cnum) < FRIENDLY) {
if (noisy)
pr("You can't unload into an unfriendly %s\n",
dchr[sect.sct_type].d_name);
@ -251,7 +251,7 @@ lload(void)
if (!player->owner) {
if (load_unload == UNLOAD || !noisy)
continue;
if (getrel(getnatp(land.lnd_own), player->cnum) != ALLIED)
if (relations_with(land.lnd_own, player->cnum) != ALLIED)
continue;
}
@ -266,7 +266,7 @@ lload(void)
xyas(sect.sct_x, sect.sct_y, player->cnum));
continue;
}
if (getrel(getnatp(sect.sct_own), player->cnum) != ALLIED) {
if (relations_with(sect.sct_own, player->cnum) != ALLIED) {
pr("Sector %s is not yours.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum));
continue;