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

reject: Create EF_REJECT table of struct rejectstr

Browse source 
New struct rejectstr is basically empty so far.  The next commit will
move reject state from struct natstr to struct rejectstr.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-10-31 13:26:37 +01:00
parent f9f3900595
commit f35f16c0a2
24 changed files with 302 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/file.h
View file

@ -156,6 +156,7 @@ enum {
EF_POWER,
EF_NATION,
EF_CONTACT,
EF_REJECT,
EF_LOAN,
EF_MAP,
EF_BMAP,

14
include/nat.h
View file

@ -161,6 +161,16 @@ enum rej_comm {
REJ_LOAN /* don't allow loans to be offered */
};
struct rejectstr {
/* initial part must match struct empobj */
signed ef_type: 8;
unsigned rej_seqno: 12;
unsigned rej_generation: 12;
int rej_uid;
time_t rej_timestamp;
/* end of part matching struct empobj */
};
extern char *relates[];
/* procedures relating to nation stuff */
@ -172,6 +182,10 @@ extern char *relates[];
#define putcontact(p) ef_write(EF_CONTACT, (p)->con_uid, (p))
#define getcontactp(n) ((struct contactstr *)ef_ptr(EF_CONTACT, (n)))
#define getreject(n, p) ef_read(EF_REJECT, (n), (p))
#define putreject(p) ef_write(EF_REJECT, (p)->rej_uid, (p))
#define getrejectp(n) ((struct rejectstr *)ef_ptr(EF_REJECT, (n)))
#define getrealm(r, n, p) ef_read(EF_REALM, ((r) + ((n) * MAXNOR)), (p))
#define putrealm(p) ef_write(EF_REALM, (p)->r_uid, (p))

1
include/nsc.h
View file

@ -274,6 +274,7 @@ extern struct castr trade_ca[];
extern struct castr nat_ca[];
extern struct castr cou_ca[];
extern struct castr contact_ca[];
extern struct castr reject_ca[];
extern struct castr realm_ca[];
extern struct castr game_ca[];
extern struct castr intrchr_ca[];