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

New relations_with()

Browse source 
Relations checking with getrel() often needs a special case for "is
same country".  If you forget, you get behavior appropriate for a
neutral foreign country, which is usually very wrong (see commit
16c68eb4 for an example).

Unlike getrel(), relations_with() considers countries allied to
themselves.  Less dangerous.  In fact, allied behavior is typically
just right, so the special case isn't even needed.
This commit is contained in:
Markus Armbruster 2011-01-25 20:13:41 +01:00
parent 0c60e574a9
commit bb5cd07ce5
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/nat.h
View file

@ -170,6 +170,7 @@ extern char *relatename(struct natstr *np, natid other);
extern char *rejectname(struct natstr *np, natid other); extern char *rejectname(struct natstr *np, natid other);
extern char *natstate(struct natstr *np); extern char *natstate(struct natstr *np);
extern int getrel(struct natstr *np, natid them); extern int getrel(struct natstr *np, natid them);
extern int relations_with(natid, natid);
extern int getrejects(natid them, struct natstr *np); extern int getrejects(natid them, struct natstr *np);
extern int getcontact(struct natstr *np, natid them); extern int getcontact(struct natstr *np, natid them);
extern void putrel(struct natstr *np, natid them, int relate); extern void putrel(struct natstr *np, natid them, int relate);

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

@ -104,6 +104,16 @@ getrel(struct natstr *np, natid them)
return np->nat_relate[them]; return np->nat_relate[them];
} }
/*
* Return relations US has with THEM.
* Countries are considered allied to themselves.
*/
int
relations_with(natid us, natid them)
{
return us == them ? ALLIED : getrel(getnatp(us), them);
}
int int
getrejects(natid them, struct natstr *np) getrejects(natid them, struct natstr *np)
{ {