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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

3
src/lib/commands/foll.c
View file

@ -60,8 +60,7 @@ foll(void)
if (!good)
return RET_SYN;
getship(leader, &ship);
if (ship.shp_own != player->cnum &&
getrel(getnatp(ship.shp_own), player->cnum) < FRIENDLY) {
if (relations_with(ship.shp_own, player->cnum) < FRIENDLY) {
pr("That ship won't let you follow.\n");
return RET_FAIL;
}