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

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

@ -29,7 +29,7 @@
* Known contributors to this file:
* Dave Pare, 1989
* Steve McClure, 1997
* Markus Armbruster, 2006-2015
* Markus Armbruster, 2006-2016
*/
#include <config.h>
@ -127,11 +127,13 @@ prod_nat(int etu)
float edu;
float hap_edu;
int pop;
int sea_money, air_money, lnd_money;
double rlev;
double tlev;
double tech[MAXNOC];
double res[MAXNOC];
double newvalue;
struct budg_item *bm;
natid n;
int cn;
struct natstr *cnp;
@ -204,11 +206,14 @@ prod_nat(int etu)
np->nat_level[NAT_RLEV] += rlev;
if (tlev != 0.0)
np->nat_level[NAT_TLEV] += tlev;
if ((sea_money[n] != 0) || (air_money[n] != 0) ||
(lnd_money[n] != 0))
bm = nat_budget[n].bm;
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,
"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",
np->nat_money - money[n]);
if (opt_LOSE_CONTACT) {