Use relations_with() for getrel(NP, THEM) where NP isn't THEM

Replacing getrel(NP, THEM), where NP is known to be getnatp(US), 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.

Adds a few calls to getnatp() hidden in relations_with().  Keeping
that optimized isn't worth it.
This commit is contained in:
Markus Armbruster 2011-02-06 10:27:45 +01:00
parent bdf63bc5fa
commit 6852ec6bc5
5 changed files with 6 additions and 6 deletions

View file

@ -90,7 +90,7 @@ play_list(struct player *joe)
/* This isn't us. Can we see it? */
if (natp->nat_stat == STAT_VIS) {
/* Yes, we can see visitors are logged on */
} else if (getrel(natp, player->cnum) < ALLIED) {
} else if (relations_with(joe->cnum, player->cnum) < ALLIED) {
/* This is a non-allied country, don't show it. */
return 0;
}