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

update: Get army, navy, air force delta from nat_budget[]

Browse source 
lnd_money[], sea_money[] and air_money[] have become redundant.
Eliminate them.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-18 23:03:04 +02:00
parent f27dd4e227
commit a5314a59c4
3 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/update.h
View file

@ -70,9 +70,6 @@ struct budget {
extern struct budget nat_budget[MAXNOC]; extern struct budget nat_budget[MAXNOC];
extern int money[MAXNOC]; extern int money[MAXNOC];
extern int pops[MAXNOC]; extern int pops[MAXNOC];
extern int sea_money[MAXNOC];
extern int lnd_money[MAXNOC];
extern int air_money[MAXNOC];
extern int tpops[MAXNOC]; extern int tpops[MAXNOC];
/* nat.c */ /* nat.c */
extern float levels[MAXNOC][4]; extern float levels[MAXNOC][4];

12
src/lib/update/main.c
View file

@ -49,9 +49,6 @@
struct budget nat_budget[MAXNOC]; struct budget nat_budget[MAXNOC];
int money[MAXNOC]; int money[MAXNOC];
int pops[MAXNOC]; int pops[MAXNOC];
int sea_money[MAXNOC];
int lnd_money[MAXNOC];
int air_money[MAXNOC];
int tpops[MAXNOC]; int tpops[MAXNOC];
void void
@ -89,9 +86,6 @@ update_main(void)
*/ */
memset(nat_budget, 0, sizeof(nat_budget)); memset(nat_budget, 0, sizeof(nat_budget));
memset(pops, 0, sizeof(pops)); memset(pops, 0, sizeof(pops));
memset(air_money, 0, sizeof(air_money));
memset(sea_money, 0, sizeof(sea_money));
memset(lnd_money, 0, sizeof(lnd_money));
for (n = 0; n < MAXNOC; n++) { for (n = 0; n < MAXNOC; n++) {
money[n] = 0; money[n] = 0;
if (!(np = getnatp(n))) if (!(np = getnatp(n)))
@ -123,12 +117,6 @@ update_main(void)
prod_ship(etu, i, NULL, 1); prod_ship(etu, i, NULL, 1);
prod_plane(etu, i, NULL, 1); prod_plane(etu, i, NULL, 1);
prod_land(etu, i, NULL, 1); prod_land(etu, i, NULL, 1);
sea_money[i] += nat_budget[i].bm[BUDG_SHP_MAINT].money
+ nat_budget[i].bm[BUDG_SHP_BUILD].money;
air_money[i] += nat_budget[i].bm[BUDG_PLN_MAINT].money
+ nat_budget[i].bm[BUDG_PLN_BUILD].money;
lnd_money[i] += nat_budget[i].bm[BUDG_LND_MAINT].money
+ nat_budget[i].bm[BUDG_LND_BUILD].money;
} }
logerror("done producing for countries."); logerror("done producing for countries.");

13
src/lib/update/nat.c
View file

@ -29,7 +29,7 @@
* Known contributors to this file: * Known contributors to this file:
* Dave Pare, 1989 * Dave Pare, 1989
* Steve McClure, 1997 * Steve McClure, 1997
* Markus Armbruster, 2006-2015 * Markus Armbruster, 2006-2016
*/ */
#include <config.h> #include <config.h>
@ -127,11 +127,13 @@ prod_nat(int etu)
float edu; float edu;
float hap_edu; float hap_edu;
int pop; int pop;
int sea_money, air_money, lnd_money;
double rlev; double rlev;
double tlev; double tlev;
double tech[MAXNOC]; double tech[MAXNOC];
double res[MAXNOC]; double res[MAXNOC];
double newvalue; double newvalue;
struct budg_item *bm;
natid n; natid n;
int cn; int cn;
struct natstr *cnp; struct natstr *cnp;
@ -204,11 +206,14 @@ prod_nat(int etu)
np->nat_level[NAT_RLEV] += rlev; np->nat_level[NAT_RLEV] += rlev;
if (tlev != 0.0) if (tlev != 0.0)
np->nat_level[NAT_TLEV] += tlev; np->nat_level[NAT_TLEV] += tlev;
if ((sea_money[n] != 0) || (air_money[n] != 0) || bm = nat_budget[n].bm;
(lnd_money[n] != 0)) sea_money = bm[BUDG_SHP_MAINT].money + bm[BUDG_SHP_BUILD].money;
air_money = bm[BUDG_PLN_MAINT].money + bm[BUDG_PLN_BUILD].money;
lnd_money = bm[BUDG_LND_MAINT].money + bm[BUDG_LND_BUILD].money;
if (sea_money || air_money || lnd_money)
wu(0, n, wu(0, n,
"Army delta $%d, Navy delta $%d, Air force delta $%d\n", "Army delta $%d, Navy delta $%d, Air force delta $%d\n",
lnd_money[n], sea_money[n], air_money[n]); lnd_money, sea_money, air_money);
wu(0, n, "money delta was $%d for this update\n", wu(0, n, "money delta was $%d for this update\n",
np->nat_money - money[n]); np->nat_money - money[n]);
if (opt_LOSE_CONTACT) { if (opt_LOSE_CONTACT) {