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

relations: Create EF_RELAT table of struct relatstr

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

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-10-31 17:42:34 +01:00
parent 33f7ae79fe
commit de24545963
24 changed files with 309 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/file.h
View file

@ -155,6 +155,7 @@ enum {
EF_TRADE,
EF_POWER,
EF_NATION,
EF_RELAT,
EF_CONTACT,
EF_REJECT,
EF_LOAN,

14
include/nat.h
View file

@ -132,6 +132,16 @@ enum relations {
ALLIED
};
struct relatstr {
/* initial part must match struct empobj */
signed ef_type: 8;
unsigned rel_seqno: 12;
unsigned rel_generation: 12;
int rel_uid;
time_t rel_timestamp;
/* end of part matching struct empobj */
};
/*
* Number of updates contact lasts for various ways of making contact.
* These are only useful with option LOSE_CONTACT, which implies
@ -182,6 +192,10 @@ struct rejectstr {
#define putnat(p) ef_write(EF_NATION, (p)->nat_cnum, (p))
#define getnatp(n) ((struct natstr *)ef_ptr(EF_NATION, (n)))
#define getrelat(n, p) ef_read(EF_RELAT, (n), (p))
#define putrelat(p) ef_write(EF_RELAT, (p)->rel_uid, (p))
#define getrelatp(n) ((struct relatstr *)ef_ptr(EF_RELAT, (n)))
#define getcontact(n, p) ef_read(EF_CONTACT, (n), (p))
#define putcontact(p) ef_write(EF_CONTACT, (p)->con_uid, (p))
#define getcontactp(n) ((struct contactstr *)ef_ptr(EF_CONTACT, (n)))

1
include/nsc.h
View file

@ -273,6 +273,7 @@ extern struct castr commodity_ca[];
extern struct castr trade_ca[];
extern struct castr nat_ca[];
extern struct castr cou_ca[];
extern struct castr relat_ca[];
extern struct castr contact_ca[];
extern struct castr reject_ca[];
extern struct castr realm_ca[];