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

(tchrstr, tchr_ca): Remove, use struct symbol and symbol_ca. Users

Browse source 
changed.
(tchr, treaty_flags): Rename for consistency with other flags.
This commit is contained in:
Markus Armbruster 2005-10-29 14:10:23 +00:00
parent 02ec5df820
commit e612db5cb6
7 changed files with 17 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/nsc.h
View file

@ -205,7 +205,6 @@ extern struct castr lchr_ca[];
extern struct castr nuke_ca[];
extern struct castr nchr_ca[];
extern struct castr treaty_ca[];
extern struct castr tchr_ca[];
extern struct castr loan_ca[];
extern struct castr news_ca[];
extern struct castr lost_ca[];
@ -220,6 +219,7 @@ extern struct symbol ship_chr_flags[];
extern struct symbol plane_chr_flags[];
extern struct symbol land_chr_flags[];
extern struct symbol nuke_chr_flags[];
extern struct symbol treaty_flags[];
extern struct castr mdchr_ca[];
extern struct symbol meta_type[];
extern struct symbol meta_flags[];

9
include/treaty.h
View file

@ -46,11 +46,6 @@ struct trtstr {
time_t trt_exp; /* expiration date */
};
struct tchrstr {
int t_cond; /* bit to indicate this clause */
char *t_name; /* description of clause */
};
#define TS_FREE 0
#define TS_PROPOSED 1
#define TS_SIGNED 2
@ -68,8 +63,6 @@ struct tchrstr {
#define TRTENL bit(9) /* no enlistment */
#define SUBFIR bit(10) /* no depth-charging submarines */
/* global treaty variables */
#define gettre(n, p) \
ef_read(EF_TREATY, n, p)
#define puttre(n, p) \
@ -77,6 +70,4 @@ struct tchrstr {
#define gettrep(n) \
(struct trtstr *) ef_ptr(EF_TREATY, n)
extern struct tchrstr tchr[];
#endif /* _TREATY_H_ */