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

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

View file

@ -47,7 +47,7 @@ shar(void)
if (to < 0)
return RET_SYN;
if (to != player->cnum && getrel(getnatp(to), player->cnum) < FRIENDLY) {
if (relations_with(to, player->cnum) < FRIENDLY) {
pr("%s does not have friendly relations towards you\n", cname(to));
return RET_FAIL;
}