X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fcommands%2Fbudg.c;h=0a0d00ceef4d975a18c7823d17fad05e4b339f51;hp=1f53961f2c8ce63628d6a37a1bfd6f5924a114a0;hb=9b7adfbe;hpb=5f263a7753dc728809ff85c993af975f6c76e61e

diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c
index 1f53961f2..0a0d00cee 100644
--- a/src/lib/commands/budg.c
+++ b/src/lib/commands/budg.c
@@ -58,273 +58,298 @@
 #define MIN(x,y)	((x) > (y) ? (y) : (x))
 #endif
 
-extern	int etu_per_update;
-extern	double bankint;
-extern	double money_civ;
-extern	double money_uw;
-extern	double money_mil;
-extern	double obrate, uwbrate; 
-extern	int etu_per_update;
-extern	double money_res;
+extern int etu_per_update;
+extern double bankint;
+extern double money_civ;
+extern double money_uw;
+extern double money_mil;
+extern double obrate, uwbrate;
+extern int etu_per_update;
+extern double money_res;
 
 s_char *dotsprintf(s_char *buf, s_char *format, int data);
 int goodsect(char c);
 void prexpense(long int cash, int *expensesp, s_char priority, int amount);
-static void calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs, int *Nuws, int *bars, int *Nbars, int *mil, int *ships, int *sbuild, int *nsbuild, int *smaint, int *units, int *lbuild, int *nlbuild, int *lmaint, int *planes, int *pbuild, int *npbuild, int *pmaint);
+static void calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs,
+		     int *Nuws, int *bars, int *Nbars, int *mil,
+		     int *ships, int *sbuild, int *nsbuild, int *smaint,
+		     int *units, int *lbuild, int *nlbuild, int *lmaint,
+		     int *planes, int *pbuild, int *npbuild, int *pmaint);
 
 int
 budg(void)
 {
-	s_char	stype=0, *pq;
-	int	priority, x;
-	long	p_sect[SCT_MAXDEF+1][2];
-	int     taxes=0, bars=0, mil=0;
-	int	Ncivs=0, Nuws=0, Nbars=0;
-	int	n, etu;
-	int	income = 0, expenses = 0;
-	int	sbuild=0,smaint=0,pbuild=0,pmaint=0, ships=0,planes=0;
-	int	nsbuild=0,npbuild=0, which=0;
-	int	lbuild=0,lmaint=0,units=0,nlbuild=0;
-	struct	natstr *np;
-	s_char	buf[1024];
-	s_char	in[80];
-
-	bzero((s_char *)p_sect,sizeof(p_sect));
-	etu = etu_per_update;
-
-	np=getnatp(player->cnum);
-	if (player->argp[1] != (s_char *)0){
-		if (goodsect(player->argp[1][0]))
-			stype=player->argp[1][0];
-		else switch(player->argp[1][0]){
-			case 'P': 
-			case 'S': 
-			case 'L': 
-			case 'A': 
-			case 'M': 
-			case 'N': 
-			case 'C': stype = player->argp[1][0]; break;
-			default: return RET_SYN;
+    s_char stype = 0, *pq;
+    int priority, x;
+    long p_sect[SCT_MAXDEF + 1][2];
+    int taxes = 0, bars = 0, mil = 0;
+    int Ncivs = 0, Nuws = 0, Nbars = 0;
+    int n, etu;
+    int income = 0, expenses = 0;
+    int sbuild = 0, smaint = 0, pbuild = 0, pmaint = 0, ships = 0, planes =
+	0;
+    int nsbuild = 0, npbuild = 0, which = 0;
+    int lbuild = 0, lmaint = 0, units = 0, nlbuild = 0;
+    struct natstr *np;
+    s_char buf[1024];
+    s_char in[80];
+
+    bzero((s_char *)p_sect, sizeof(p_sect));
+    etu = etu_per_update;
+
+    np = getnatp(player->cnum);
+    if (player->argp[1] != (s_char *)0) {
+	if (goodsect(player->argp[1][0]))
+	    stype = player->argp[1][0];
+	else
+	    switch (player->argp[1][0]) {
+	    case 'P':
+	    case 'S':
+	    case 'L':
+	    case 'A':
+	    case 'M':
+	    case 'N':
+	    case 'C':
+		stype = player->argp[1][0];
+		break;
+	    default:
+		return RET_SYN;
+	    }
+    }
+    if ((stype != 0) && (stype != 'C')) {
+	pq = getstarg(player->argp[2], "Priority? ", buf);
+    } else {
+	pq = (s_char *)0;
+    }
+    if (pq != (s_char *)0) {
+	if (isdigit(*pq)) {
+	    priority = (atoi(pq) < 0 ? -1 * atoi(pq) : atoi(pq));
+	    if (priority >= SCT_MAXDEF + 8) {
+		pr("Priorities must be less than %d!\n", SCT_MAXDEF + 8);
+		return RET_FAIL;
+	    }
+	    for (x = 0; x < SCT_MAXDEF + 8; x++)
+		if (priority && (np->nat_priorities[x] == priority)) {
+		    pr("Priorities must be unique!\n");
+		    return RET_FAIL;
 		}
-	}
-	if ((stype != 0) && (stype != 'C')) {
-		pq = getstarg(player->argp[2], "Priority? ", buf);
+	} else if (*pq == '~')
+	    priority = -1;
+	else
+	    return RET_SYN;
+    }
+    if ((stype) && !player->god) {
+	if (!isupper(stype)) {
+	    which = 0;
+	    while ((which < SCT_MAXDEF + 2) &&
+		   (stype != dchr[which].d_mnem))
+		which++;
+	    if (which == SCT_MAXDEF + 2)
+		return RET_SYN;
 	} else {
-		pq = (s_char *)0;
-	}
-	if (pq != (s_char *)0) {
-		if (isdigit(*pq)){
-			priority=(atoi(pq) < 0 ? -1*atoi(pq) : atoi(pq));
-			if (priority >= SCT_MAXDEF+8){
-				pr("Priorities must be less than %d!\n",
-					SCT_MAXDEF+8);
-				return RET_FAIL;
-			}
-			for(x=0;x<SCT_MAXDEF+8;x++)
-				if (priority &&
-					(np->nat_priorities[x] == priority)){
-					pr("Priorities must be unique!\n");
-					return RET_FAIL;
-				}
-		} else if (*pq == '~')
-			priority = -1;
-		else
-			return RET_SYN;
+	    switch (stype) {
+	    case 'P':
+		which = PRI_PBUILD;
+		break;
+	    case 'S':
+		which = PRI_SBUILD;
+		break;
+	    case 'L':
+		which = PRI_LBUILD;
+		break;
+	    case 'A':
+		which = PRI_LMAINT;
+		break;
+	    case 'M':
+		which = PRI_SMAINT;
+		break;
+	    case 'N':
+		which = PRI_PMAINT;
+		break;
+	    case 'C':
+		which = (-1);
+		break;
+	    default:
+		return RET_SYN;
+	    }
 	}
-	if ((stype) && !player->god){
-		if (!isupper(stype)){
-			which=0;
-			while ((which<SCT_MAXDEF+2) &&
-				(stype != dchr[which].d_mnem))
-				which++;
-			if (which == SCT_MAXDEF+2)
-				return RET_SYN;
-		}else{
-			switch(stype){
-				case 'P': which=PRI_PBUILD;break;
-				case 'S': which=PRI_SBUILD;break;
-				case 'L': which=PRI_LBUILD;break;
-				case 'A': which=PRI_LMAINT;break;
-				case 'M': which=PRI_SMAINT;break;
-				case 'N': which=PRI_PMAINT;break;
-				case 'C': which=(-1);break;
-				default:  return RET_SYN;
-			}
-		}
-		if (which == -1){
-			for(x=0;x<SCT_MAXDEF+8;x++){
-				np->nat_priorities[x] = -1;
-			}
-		} else {
-			np->nat_priorities[which] = priority;
-		}
-		
+	if (which == -1) {
+	    for (x = 0; x < SCT_MAXDEF + 8; x++) {
+		np->nat_priorities[x] = -1;
+	    }
+	} else {
+	    np->nat_priorities[which] = priority;
 	}
-	putnat(np);
-
-	player->simulation = 1;
-	calc_all(p_sect,&taxes,&Ncivs,&Nuws,&bars,&Nbars,&mil,&ships,&sbuild,&nsbuild,
-		&smaint,&units,&lbuild,&nlbuild,&lmaint,&planes,&pbuild,
-		&npbuild,&pmaint);
-
-	income = taxes + bars;
-	pr("Sector Type\t\tAbbr\tProduction\tPriority\t    Cost\n");
-	for(x=0;x<SCT_MAXDEF+1;x++){
-		if (!p_sect[x][1] && np->nat_priorities[x] == -1)
-			continue;
-		if (!pchr[dchr[x].d_prd].p_cost &&
-		    np->nat_priorities[x] == -1 &&
-		    x != SCT_ENLIST) {
-			continue;
-		}
-		
-		pr("%-17s\t%c\t",dchr[x].d_name,dchr[x].d_mnem);
-		if (x == SCT_ENLIST)
-			pr("%d mil    \t",p_sect[x][0]);
-		else if (pchr[dchr[x].d_prd].p_cost != 0)
-			pr("%d %-7s\t",p_sect[x][0],
-			   pchr[dchr[x].d_prd].p_sname);
-		else pr("\t\t");
-		
-		if (np->nat_priorities[x] != -1){
-			pr("%d",np->nat_priorities[x]);
-		}
-		pr("\t");
-		pr("\t");
-		if (np->nat_priorities[x] != 0){
-			if ((np->nat_money+income-expenses) > 0){
-				pr("%8d",p_sect[x][1]);
-				expenses += p_sect[x][1];
-			}
-			else
-				pr("[%7d]",p_sect[x][1]);
-		}else{
-			if ((np->nat_money+income-expenses) > 0)
-				pr("(%7d)",p_sect[x][1]);
-			else
-				pr("[(%7d)]",p_sect[x][1]);
-		}
 
-		pr("\n");
-	}
+    }
+    putnat(np);
 
-	if (lbuild) {
-		sprintf(buf,"%d unit%s",nlbuild,splur(nlbuild));
-		pr("Unit building\t\tL\t%-16s", buf);
-		if (np->nat_priorities[PRI_LBUILD] != -1)
-			pr("%d",np->nat_priorities[PRI_LBUILD]);
-		prexpense(np->nat_money+income, &expenses, np->nat_priorities[PRI_LBUILD], -1*lbuild);
-	}
+    player->simulation = 1;
+    calc_all(p_sect, &taxes, &Ncivs, &Nuws, &bars, &Nbars, &mil, &ships,
+	     &sbuild, &nsbuild, &smaint, &units, &lbuild, &nlbuild,
+	     &lmaint, &planes, &pbuild, &npbuild, &pmaint);
 
-	if (lmaint) {
-		sprintf(buf,"%d unit%s",units,splur(units));
-		pr("Unit maintenance\tA\t%-16s",buf);
-		if (np->nat_priorities[PRI_LMAINT] != -1)
-			pr("%d",np->nat_priorities[PRI_LMAINT]);
-		prexpense(np->nat_money+income, &expenses, np->nat_priorities[PRI_LMAINT], -1*lmaint);
+    income = taxes + bars;
+    pr("Sector Type\t\tAbbr\tProduction\tPriority\t    Cost\n");
+    for (x = 0; x < SCT_MAXDEF + 1; x++) {
+	if (!p_sect[x][1] && np->nat_priorities[x] == -1)
+	    continue;
+	if (!pchr[dchr[x].d_prd].p_cost &&
+	    np->nat_priorities[x] == -1 && x != SCT_ENLIST) {
+	    continue;
 	}
 
-	if (sbuild) {
-		sprintf(buf,"%d ship%s",nsbuild,splur(nsbuild));
-		pr("Ship building\t\tS\t%-16s", buf);
-		if (np->nat_priorities[PRI_SBUILD] != -1)
-			pr("%d",np->nat_priorities[PRI_SBUILD]);
-		prexpense(np->nat_money+income, &expenses, np->nat_priorities[PRI_SBUILD], -1*sbuild);
-	}
+	pr("%-17s\t%c\t", dchr[x].d_name, dchr[x].d_mnem);
+	if (x == SCT_ENLIST)
+	    pr("%d mil    \t", p_sect[x][0]);
+	else if (pchr[dchr[x].d_prd].p_cost != 0)
+	    pr("%d %-7s\t", p_sect[x][0], pchr[dchr[x].d_prd].p_sname);
+	else
+	    pr("\t\t");
 
-	if (smaint) {
-		sprintf(buf,"%d ship%s",ships,splur(ships));
-		pr("Ship maintenance\tM\t%-16s",buf);
-		if (np->nat_priorities[PRI_SMAINT] != -1)
-			pr("%d",np->nat_priorities[PRI_SMAINT]);
-		prexpense(np->nat_money+income, &expenses, np->nat_priorities[PRI_SMAINT], -1*smaint);
+	if (np->nat_priorities[x] != -1) {
+	    pr("%d", np->nat_priorities[x]);
 	}
-
-	if (pbuild) {
-		sprintf(buf,"%d plane%s",npbuild,splur(npbuild));
-		pr("Plane building\t\tP\t%-16s",buf);
-		if (np->nat_priorities[PRI_PBUILD] != -1)
-			pr("%d",np->nat_priorities[PRI_PBUILD]);
-		prexpense(np->nat_money+income, &expenses, np->nat_priorities[PRI_PBUILD], -1*pbuild);
+	pr("\t");
+	pr("\t");
+	if (np->nat_priorities[x] != 0) {
+	    if ((np->nat_money + income - expenses) > 0) {
+		pr("%8d", p_sect[x][1]);
+		expenses += p_sect[x][1];
+	    } else
+		pr("[%7d]", p_sect[x][1]);
+	} else {
+	    if ((np->nat_money + income - expenses) > 0)
+		pr("(%7d)", p_sect[x][1]);
+	    else
+		pr("[(%7d)]", p_sect[x][1]);
 	}
 
-	if (pmaint) {
-		sprintf(buf,"%d plane%s",planes,splur(planes));
-		pr("Plane maintenance\tN\t%-16s",buf);
-		if (np->nat_priorities[PRI_PMAINT] != -1)
-			pr("%d",np->nat_priorities[PRI_PMAINT]);
-		prexpense(np->nat_money+income, &expenses, np->nat_priorities[PRI_PMAINT], -1*pmaint);
-	}
-	if (p_sect[SCT_EFFIC][1]) {
-		pr("Sector building\t\t\t\t%8d sct(s)\t\t%8d\n",p_sect[SCT_EFFIC][0], p_sect[SCT_EFFIC][1]);
-		expenses += p_sect[SCT_EFFIC][1];
-	}
-	if (mil) {
-		
-		n = (mil - np->nat_reserve * money_res * etu)/(etu*money_mil);
-		sprintf(in, "%d mil, %d res", n, (int)np->nat_reserve);
-		pr("Military payroll\t\t%-32s%8d\n",
-		   in, -mil);
-		expenses -= mil;
-	}
-	if (p_sect[SCT_CAPIT][0]) {
-		n = p_sect[SCT_CAPIT][0];
-		sprintf(in, "%d %s",
-			n,
-			n==1?opt_BIG_CITY?"city":"capital":opt_BIG_CITY?"cities":"capitals");
-		pr("%s maintenance\t\t%-32s%8d\n",
-		   opt_BIG_CITY?"City":"Capital",
-		   in,
-		   p_sect[SCT_CAPIT][1]);
-		expenses += p_sect[SCT_CAPIT][1];
-	}
-	pr("Total expenses%s\n", dotsprintf(buf,"%58d", expenses));
-	if (taxes) {
-		sprintf(in, "%d civ%s, %d uw%s",
-			Ncivs,splur(Ncivs),
-			Nuws,splur(Nuws));
-		pr("Income from taxes\t\t%-32s%+8d\n",
-		   in,
-		   taxes);
-	}
-	if (bars) {
-		sprintf(in, "%d bar%s",	Nbars, splur(Nbars));
-		pr("Income from bars\t\t%-32s%+8d\n",
-		   in,
-		   bars);
-	}
-	pr("Total income%s\n", dotsprintf(buf,"%+60d", income));
-	pr("Balance forward\t\t\t\t\t\t      %10d\n", np->nat_money);
-	pr("Estimated delta\t\t\t\t\t\t      %+10d\n",income-expenses);
-	pr("Estimated new treasury%s\n",dotsprintf(buf,"%50d",np->nat_money+income-expenses));
-	if (((np->nat_money+income-expenses) < 0) && !player->god){
-		pr("After processsing sectors, you will be broke!\n");
-		pr("Sectors will not produce, distribute, or deliver!\n\n");
-	}
+	pr("\n");
+    }
+
+    if (lbuild) {
+	sprintf(buf, "%d unit%s", nlbuild, splur(nlbuild));
+	pr("Unit building\t\tL\t%-16s", buf);
+	if (np->nat_priorities[PRI_LBUILD] != -1)
+	    pr("%d", np->nat_priorities[PRI_LBUILD]);
+	prexpense(np->nat_money + income, &expenses,
+		  np->nat_priorities[PRI_LBUILD], -1 * lbuild);
+    }
+
+    if (lmaint) {
+	sprintf(buf, "%d unit%s", units, splur(units));
+	pr("Unit maintenance\tA\t%-16s", buf);
+	if (np->nat_priorities[PRI_LMAINT] != -1)
+	    pr("%d", np->nat_priorities[PRI_LMAINT]);
+	prexpense(np->nat_money + income, &expenses,
+		  np->nat_priorities[PRI_LMAINT], -1 * lmaint);
+    }
+
+    if (sbuild) {
+	sprintf(buf, "%d ship%s", nsbuild, splur(nsbuild));
+	pr("Ship building\t\tS\t%-16s", buf);
+	if (np->nat_priorities[PRI_SBUILD] != -1)
+	    pr("%d", np->nat_priorities[PRI_SBUILD]);
+	prexpense(np->nat_money + income, &expenses,
+		  np->nat_priorities[PRI_SBUILD], -1 * sbuild);
+    }
+
+    if (smaint) {
+	sprintf(buf, "%d ship%s", ships, splur(ships));
+	pr("Ship maintenance\tM\t%-16s", buf);
+	if (np->nat_priorities[PRI_SMAINT] != -1)
+	    pr("%d", np->nat_priorities[PRI_SMAINT]);
+	prexpense(np->nat_money + income, &expenses,
+		  np->nat_priorities[PRI_SMAINT], -1 * smaint);
+    }
+
+    if (pbuild) {
+	sprintf(buf, "%d plane%s", npbuild, splur(npbuild));
+	pr("Plane building\t\tP\t%-16s", buf);
+	if (np->nat_priorities[PRI_PBUILD] != -1)
+	    pr("%d", np->nat_priorities[PRI_PBUILD]);
+	prexpense(np->nat_money + income, &expenses,
+		  np->nat_priorities[PRI_PBUILD], -1 * pbuild);
+    }
+
+    if (pmaint) {
+	sprintf(buf, "%d plane%s", planes, splur(planes));
+	pr("Plane maintenance\tN\t%-16s", buf);
+	if (np->nat_priorities[PRI_PMAINT] != -1)
+	    pr("%d", np->nat_priorities[PRI_PMAINT]);
+	prexpense(np->nat_money + income, &expenses,
+		  np->nat_priorities[PRI_PMAINT], -1 * pmaint);
+    }
+    if (p_sect[SCT_EFFIC][1]) {
+	pr("Sector building\t\t\t\t%8d sct(s)\t\t%8d\n",
+	   p_sect[SCT_EFFIC][0], p_sect[SCT_EFFIC][1]);
+	expenses += p_sect[SCT_EFFIC][1];
+    }
+    if (mil) {
 
-	player->simulation = 0;
-	return RET_OK;
+	n = (mil - np->nat_reserve * money_res * etu) / (etu * money_mil);
+	sprintf(in, "%d mil, %d res", n, (int)np->nat_reserve);
+	pr("Military payroll\t\t%-32s%8d\n", in, -mil);
+	expenses -= mil;
+    }
+    if (p_sect[SCT_CAPIT][0]) {
+	n = p_sect[SCT_CAPIT][0];
+	sprintf(in, "%d %s",
+		n,
+		n ==
+		1 ? opt_BIG_CITY ? "city" : "capital" : opt_BIG_CITY ?
+		"cities" : "capitals");
+	pr("%s maintenance\t\t%-32s%8d\n",
+	   opt_BIG_CITY ? "City" : "Capital", in, p_sect[SCT_CAPIT][1]);
+	expenses += p_sect[SCT_CAPIT][1];
+    }
+    pr("Total expenses%s\n", dotsprintf(buf, "%58d", expenses));
+    if (taxes) {
+	sprintf(in, "%d civ%s, %d uw%s",
+		Ncivs, splur(Ncivs), Nuws, splur(Nuws));
+	pr("Income from taxes\t\t%-32s%+8d\n", in, taxes);
+    }
+    if (bars) {
+	sprintf(in, "%d bar%s", Nbars, splur(Nbars));
+	pr("Income from bars\t\t%-32s%+8d\n", in, bars);
+    }
+    pr("Total income%s\n", dotsprintf(buf, "%+60d", income));
+    pr("Balance forward\t\t\t\t\t\t      %10d\n", np->nat_money);
+    pr("Estimated delta\t\t\t\t\t\t      %+10d\n", income - expenses);
+    pr("Estimated new treasury%s\n",
+       dotsprintf(buf, "%50d", np->nat_money + income - expenses));
+    if (((np->nat_money + income - expenses) < 0) && !player->god) {
+	pr("After processsing sectors, you will be broke!\n");
+	pr("Sectors will not produce, distribute, or deliver!\n\n");
+    }
+
+    player->simulation = 0;
+    return RET_OK;
 }
 
 static void
-calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs, int *Nuws, int *bars, int *Nbars, int *mil, int *ships, int *sbuild, int *nsbuild, int *smaint, int *units, int *lbuild, int *nlbuild, int *lmaint, int *planes, int *pbuild, int *npbuild, int *pmaint)
+calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs, int *Nuws,
+	 int *bars, int *Nbars, int *mil, int *ships, int *sbuild,
+	 int *nsbuild, int *smaint, int *units, int *lbuild, int *nlbuild,
+	 int *lmaint, int *planes, int *pbuild, int *npbuild, int *pmaint)
 {
-    register int y,z;
-    struct	natstr *np;
-    int	sm=0,sb=0,pm=0,pb=0,lm=0,lb=0;
-    int     *bp;
-    long     pop = 0;
-    int     n, civ_tax, uw_tax, mil_pay;
+    register int y, z;
+    struct natstr *np;
+    int sm = 0, sb = 0, pm = 0, pb = 0, lm = 0, lb = 0;
+    int *bp;
+    long pop = 0;
+    int n, civ_tax, uw_tax, mil_pay;
     struct sctstr *sp;
-    int     etu=etu_per_update;
-    int     vec[I_MAX+1];
-    long    tmp_money;
+    int etu = etu_per_update;
+    int vec[I_MAX + 1];
+    long tmp_money;
     extern long sea_money[MAXNOC];
     extern long lnd_money[MAXNOC];
     extern long air_money[MAXNOC];
     extern long tpops[MAXNOC];
     extern int mil_dbl_pay;
-    
+
     lnd_money[player->cnum] = sea_money[player->cnum] = 0;
     air_money[player->cnum] = 0;
     mil_dbl_pay = 0;
@@ -332,7 +357,7 @@ calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs, int *Nuws, int *bars, in
     *Ncivs = 0;
     np = getnatp(player->cnum);
     bp = (int *)calloc(WORLD_X * WORLD_Y * 8, sizeof(int));
-    for (n=0; NULL != (sp = getsectid(n)) ;n++){
+    for (n = 0; NULL != (sp = getsectid(n)); n++) {
 	fill_update_array(bp, sp);
 	if (sp->sct_own == player->cnum) {
 	    sp->sct_updated = 0;
@@ -349,90 +374,90 @@ calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs, int *Nuws, int *bars, in
 	}
     }
     tpops[player->cnum] = pop;
-    *mil += (int) (np->nat_reserve * money_res * etu);
-    
-    *mil += (int) upd_slmilcosts(np->nat_cnum, etu);
-    
-    for(y=1;y<SCT_MAXDEF+8;y++){
-	for(z=0;z<SCT_MAXDEF+8;z++)
+    *mil += (int)(np->nat_reserve * money_res * etu);
+
+    *mil += (int)upd_slmilcosts(np->nat_cnum, etu);
+
+    for (y = 1; y < SCT_MAXDEF + 8; y++) {
+	for (z = 0; z < SCT_MAXDEF + 8; z++)
 	    if (np->nat_priorities[z] == y)
-		switch(z){
+		switch (z) {
 		case PRI_SMAINT:
 		    tmp_money = lnd_money[player->cnum];
-		    *ships=prod_ship(etu, player->cnum,bp,0);
+		    *ships = prod_ship(etu, player->cnum, bp, 0);
 		    *smaint = lnd_money[player->cnum] - tmp_money;
-		    sm=1;
+		    sm = 1;
 		    break;
 		case PRI_SBUILD:
 		    tmp_money = sea_money[player->cnum];
-		    *nsbuild=prod_ship(etu, player->cnum,bp,1);
+		    *nsbuild = prod_ship(etu, player->cnum, bp, 1);
 		    *sbuild = sea_money[player->cnum] - tmp_money;
-		    sb=1;
+		    sb = 1;
 		    break;
 		case PRI_LMAINT:
 		    tmp_money = lnd_money[player->cnum];
-		    *units=prod_land(etu, player->cnum,bp,0);
+		    *units = prod_land(etu, player->cnum, bp, 0);
 		    *lmaint = lnd_money[player->cnum] - tmp_money;
-		    lm=1;
+		    lm = 1;
 		    break;
 		case PRI_LBUILD:
 		    tmp_money = lnd_money[player->cnum];
-		    *nlbuild=prod_land(etu, player->cnum,bp,1);
+		    *nlbuild = prod_land(etu, player->cnum, bp, 1);
 		    *lbuild = lnd_money[player->cnum] - tmp_money;
-		    lb=1;
+		    lb = 1;
 		    break;
 		case PRI_PMAINT:
 		    tmp_money = air_money[player->cnum];
-		    *planes=prod_plane(etu, player->cnum,bp,0);
+		    *planes = prod_plane(etu, player->cnum, bp, 0);
 		    *pmaint = air_money[player->cnum] - tmp_money;
-		    pm=1;
+		    pm = 1;
 		    break;
 		case PRI_PBUILD:
 		    tmp_money = air_money[player->cnum];
-		    *npbuild=prod_plane(etu, player->cnum,bp,1);
+		    *npbuild = prod_plane(etu, player->cnum, bp, 1);
 		    *pbuild = air_money[player->cnum] - tmp_money;
-		    pb=1;
+		    pb = 1;
 		    break;
 		default:
-		    produce_sect(player->cnum,etu,bp,p_sect,z);
+		    produce_sect(player->cnum, etu, bp, p_sect, z);
 		    break;
 		}
     }
     /* 0 is maintain, 1 is build */
     if (!sm) {
 	tmp_money = sea_money[player->cnum];
-	*ships=prod_ship(etu,player->cnum,bp,0);
+	*ships = prod_ship(etu, player->cnum, bp, 0);
 	*smaint = sea_money[player->cnum] - tmp_money;
     }
     if (!sb) {
 	tmp_money = sea_money[player->cnum];
-	*nsbuild=prod_ship(etu,player->cnum,bp,1);
+	*nsbuild = prod_ship(etu, player->cnum, bp, 1);
 	*sbuild = sea_money[player->cnum] - tmp_money;
     }
     if (!lm) {
 	tmp_money = lnd_money[player->cnum];
-	*units=prod_land(etu,player->cnum,bp,0);
+	*units = prod_land(etu, player->cnum, bp, 0);
 	*lmaint = lnd_money[player->cnum] - tmp_money;
     }
     if (!lb) {
 	tmp_money = lnd_money[player->cnum];
-	*nlbuild=prod_land(etu,player->cnum,bp,1);
+	*nlbuild = prod_land(etu, player->cnum, bp, 1);
 	*lbuild = lnd_money[player->cnum] - tmp_money;
     }
     if (!pm) {
 	tmp_money = air_money[player->cnum];
-	*planes=prod_plane(etu,player->cnum,bp,0);
+	*planes = prod_plane(etu, player->cnum, bp, 0);
 	*pmaint = air_money[player->cnum] - tmp_money;
     }
     if (!pb) {
 	tmp_money = air_money[player->cnum];
-	*npbuild=prod_plane(etu,player->cnum,bp,1);
+	*npbuild = prod_plane(etu, player->cnum, bp, 1);
 	*pbuild = air_money[player->cnum] - tmp_money;
     }
-    
+
     /* produce all sects that haven't produced yet */
-    produce_sect(player->cnum,etu,bp,p_sect,-1);
-    
+    produce_sect(player->cnum, etu, bp, p_sect, -1);
+
     lnd_money[player->cnum] = sea_money[player->cnum] = 0;
     air_money[player->cnum] = 0;
     free(bp);
@@ -441,37 +466,36 @@ calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs, int *Nuws, int *bars, in
 int
 goodsect(char c)
 {
-	register int x;
+    register int x;
 
-	for(x=4;x<SCT_MAXDEF+2;x++)
-		if (dchr[x].d_mnem == c)
-			return 1;
+    for (x = 4; x < SCT_MAXDEF + 2; x++)
+	if (dchr[x].d_mnem == c)
+	    return 1;
 
-	return 0;
+    return 0;
 }
 
 s_char *
 dotsprintf(s_char *buf, s_char *format, int data)
 {
-	sprintf(buf, format, data);
-	return (s_char *)memset(buf, '.', strspn(buf, " "));
+    sprintf(buf, format, data);
+    return (s_char *)memset(buf, '.', strspn(buf, " "));
 }
 
 void
 prexpense(long int cash, int *expensesp, s_char priority, int amount)
 {
-	if (cash > *expensesp) {
-		if (priority) {
-			pr("\t\t%8d\n",amount);
-			*expensesp += amount;
-		} else
-			pr("\t\t(%7d)\n",amount);
-	} else {
-		if (priority) {
-			pr("\t\t[%7d]\n", amount);
-			*expensesp += amount;
-		} else
-			pr("\t\t[(%6d)]\n", amount);
-	}
+    if (cash > *expensesp) {
+	if (priority) {
+	    pr("\t\t%8d\n", amount);
+	    *expensesp += amount;
+	} else
+	    pr("\t\t(%7d)\n", amount);
+    } else {
+	if (priority) {
+	    pr("\t\t[%7d]\n", amount);
+	    *expensesp += amount;
+	} else
+	    pr("\t\t[(%6d)]\n", amount);
+    }
 }
-