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

relations: Inline putrel() into its only caller setrel()

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-10-31 14:17:27 +01:00
parent e5db45058d
commit f88365e762
3 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/nat.h
View file

@ -201,7 +201,6 @@ extern int getrel(struct natstr *np, natid them);
extern int relations_with(natid, natid); extern int relations_with(natid, natid);
extern int nat_accepts(natid, natid, enum rej_comm); extern int nat_accepts(natid, natid, enum rej_comm);
extern int in_contact(natid, natid); extern int in_contact(natid, natid);
extern void putrel(struct natstr *np, natid them, int relate);
extern void agecontact(struct natstr *np); extern void agecontact(struct natstr *np);
extern int influx(struct natstr *np); extern int influx(struct natstr *np);
extern struct natstr *nat_reset(struct natstr *, natid, char *, char *, extern struct natstr *nat_reset(struct natstr *, natid, char *, char *,

6
src/lib/common/nat.c
View file

@ -116,12 +116,6 @@ in_contact(natid us, natid them)
return getcontactp(us)->con_contact[them]; return getcontactp(us)->con_contact[them];
} }
void
putrel(struct natstr *np, natid them, int relate)
{
np->nat_relate[them] = relate;
}
int int
influx(struct natstr *np) influx(struct natstr *np)
{ {

2
src/lib/subs/rej.c
View file

@ -92,7 +92,7 @@ setrel(natid us, natid them, int rel)
"Country %s has %s their relations with you to \"%s\"!\n", "Country %s has %s their relations with you to \"%s\"!\n",
prnat(mynp), whichway, relates[rel]); prnat(mynp), whichway, relates[rel]);
putrel(mynp, them, rel); mynp->nat_relate[them] = rel;
putnat(mynp); putnat(mynp);
if (!player->god) { if (!player->god) {