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

Remove budget priorities:

Browse source 
(budg, player_coms): Remove command arguments.
(PRI_SMAINT, PRI_PMAINT, PRI_LMAINT, PRI_SBUILD, PRI_PBUILD)
(PRI_LBUILD, PRI_MAX): Remove.
(natstr): Remove member nat_priorities.
(add, main): Remove its initialization.
(budg, cal_call, prexpense, prod, update_main, upd_land, upd_plane)
(upd_buildeff, produce_sect, upd_ship): Simplify.
(produce_sect): Last parameter now superflous, remove & simplify.
(change_prio, do_prod): Unused, remove.

(budg): Move land units output down, to match update sequence.
This commit is contained in:
Markus Armbruster 2006-05-29 20:43:30 +00:00
parent 26110320c0
commit 520446ef39
14 changed files with 170 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/nat.h
View file

@ -54,17 +54,6 @@ typedef enum {
STAT_GOD /* deity powers */
} nat_status;
enum { /* Priorities */
/* sector types are also priorities */
PRI_SMAINT = SCT_MAXDEF+1, /* ship maintenance */
PRI_PMAINT, /* plane maintenance */
PRI_LMAINT, /* land unit maintenance */
PRI_SBUILD, /* ship building */
PRI_PBUILD, /* plane building */
PRI_LBUILD, /* land building */
PRI_MAX = PRI_LBUILD
};
/*
* TODO
@ -73,7 +62,6 @@ enum { /* Priorities */
*
* The only user of r_cnum and r_realm appears to be xdump.
* If we had working virtual selectors, we could remove r_cnum and r_realm.
*
*/
struct realmstr {
/* initial part must match struct genitem */
@ -117,7 +105,6 @@ struct natstr {
unsigned char nat_relate[MAXNOC];
unsigned char nat_contact[MAXNOC];
unsigned char nat_rejects[MAXNOC];
signed char nat_priorities[PRI_MAX+1]; /* budget priority */
long nat_flags; /* nation flags */
};