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

(effadv_list, effadv, rejects, rejectname, telnames, rea, numnames,

Browse source 
tennames, numstr): Replace by static local variables in their only
user.
(relates): Move from global/misc.c to common/nat.c.
(att_mode): Move from global/misc.c to subs/attsub.c.
This commit is contained in:
Markus Armbruster 2004-02-19 19:14:29 +00:00
parent 22a356b1e1
commit c8bb4d9b87
8 changed files with 56 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,12 @@
#include "file.h"
#include "optlist.h"
s_char *relates[] = {
/* must follow nation relation defines in nat.h */
"At War", "Sitzkrieg", "Mobilizing", "Hostile", "Neutral", "Friendly",
"Allied"
};
s_char *
cname(natid n)
{
@ -49,15 +55,31 @@ cname(natid n)
s_char *
relatename(struct natstr *np, natid other)
{
extern s_char *relates[];
return relates[getrel(np, other)];
}
s_char *
rejectname(struct natstr *np, natid other)
{
extern s_char *rejects[];
s_char *rejects[] = {
/* must follow reject flags defined in nat.h */
" YES YES YES YES",
" NO YES YES YES",
" YES NO YES YES",
" NO NO YES YES",
" YES YES NO YES",
" NO YES NO YES",
" YES NO NO YES",
" NO NO NO YES",
" YES YES YES NO ",
" NO YES YES NO ",
" YES NO YES NO ",
" NO NO YES NO ",
" YES YES NO NO ",
" NO YES NO NO ",
" YES NO NO NO ",
" NO NO NO NO "
};
return rejects[getrejects(other, np)];
}