]> git.pond.sub.org Git - empserver/blobdiff - src/lib/commands/budg.c
License upgrade to GPL version 3 or later
[empserver] / src / lib / commands / budg.c
index 1f53961f2c8ce63628d6a37a1bfd6f5924a114a0..15312e10f40054b5d43f229a25327a557f9316ff 100644 (file)
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  budg.c: Calculate production levels, prioritize
- * 
+ *
  *  Known contributors to this file:
  *     Thomas Ruschak, 1992
  *     Ville Virrankoski, 1995
  *     Steve McClure, 1997-2000
+ *     Markus Armbruster, 2004-2009
  */
 
-#ifdef Rel4
-#include <string.h>
-#endif /* Rel4 */
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
-#include "product.h"
-#include "nat.h"
+#include <config.h>
+
+#include <ctype.h>
+#include "budg.h"
+#include "commands.h"
 #include "item.h"
-#include "file.h"
-#include "deity.h"
-#include "ship.h"
 #include "land.h"
-#include "plane.h"
 #include "optlist.h"
-#include "budg.h"
-#include "commands.h"
-
-#ifndef MIN
-#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;
+#include "plane.h"
+#include "product.h"
+#include "ship.h"
 
-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 (*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 char *dotsprintf(char *buf, char *format, int data);
 
 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];
+    int i;
+    long p_sect[SCT_BUDG_MAX+1][2];
+    int taxes, Ncivs, Nuws, bars, Nbars, mil;
+    int ships, sbuild, nsbuild, smaint;
+    int units, lbuild, nlbuild, lmaint;
+    int planes, pbuild, npbuild, pmaint;
+    int n, etu;
+    int income, expenses;
+    struct natstr *np;
+    char buf[1024];
+    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;
-                               }
-               } 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{
-                       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;
-               }
-               
-       }
-       putnat(np);
+    etu = etu_per_update;
 
-       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);
+    np = getnatp(player->cnum);
 
-       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]);
-               }
+    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);
+    player->simulation = 0;
 
-               pr("\n");
-       }
+    income = taxes + bars;
+    expenses = 0;
+    pr("Sector Type\t\t\tProduction\t\t\t    Cost\n");
+    for (i = 0; i <= SCT_TYPE_MAX; i++) {
+       if (!p_sect[i][1])
+           continue;
+       pr("%-17s\t\t", dchr[i].d_name);
+       if (i == SCT_ENLIST)
+           pr("%ld mil    \t", p_sect[i][0]);
+       else if (dchr[i].d_prd >= 0)
+           pr("%ld %-7s\t", p_sect[i][0], pchr[dchr[i].d_prd].p_sname);
+       else
+           pr("\t\t");
+       pr("\t\t%8ld\n", p_sect[i][1]);
+       expenses += p_sect[i][1];
+    }
 
-       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 (sbuild) {
+       sprintf(buf, "%d ship%s", nsbuild, splur(nsbuild));
+       pr("Ship building\t\t\t%-16s\t\t%8d\n", buf, -sbuild);
+       expenses += -sbuild;
+    }
 
-       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 (smaint) {
+       sprintf(buf, "%d ship%s", ships, splur(ships));
+       pr("Ship maintenance\t\t%-16s\t\t%8d\n", buf, -smaint);
+       expenses += -smaint;
+    }
 
-       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 (pbuild) {
+       sprintf(buf, "%d plane%s", npbuild, splur(npbuild));
+       pr("Plane building\t\t\t%-16s\t\t%8d\n", buf, -pbuild);
+       expenses += -pbuild;
+    }
 
-       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 (pmaint) {
+       sprintf(buf, "%d plane%s", planes, splur(planes));
+       pr("Plane maintenance\t\t%-16s\t\t%8d\n", buf, -pmaint);
+       expenses += -pmaint;
+    }
+    if (lbuild) {
+       sprintf(buf, "%d unit%s", nlbuild, splur(nlbuild));
+       pr("Unit building\t\t\t%-16s\t\t%8d\n", buf, -lbuild);
+       expenses += -lbuild;
+    }
 
-       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 (lmaint) {
+       sprintf(buf, "%d unit%s", units, splur(units));
+       pr("Unit maintenance\t\t%-16s\t\t%8d\n", buf, -lmaint);
+       expenses += -lmaint;
+    }
 
-       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");
-       }
+    if (p_sect[SCT_EFFIC][1]) {
+       sprintf(buf, "%ld sector%s",
+               p_sect[SCT_EFFIC][0], splur(p_sect[SCT_EFFIC][0]));
+       pr("Sector building\t\t\t%-16s\t\t%8ld\n",
+          buf, p_sect[SCT_EFFIC][1]);
+       expenses += p_sect[SCT_EFFIC][1];
+    }
+    if (p_sect[SCT_MAINT][0]) {
+       sprintf(buf, "%ld sector%s",
+               p_sect[SCT_MAINT][0], splur(p_sect[SCT_MAINT][0]));
+       pr("Sector maintenance\t\t%-16s\t\t%8ld\n",
+          buf, p_sect[SCT_MAINT][1]);
+       expenses += p_sect[SCT_MAINT][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;
+    }
+    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      %10ld\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;
+    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 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;
+    struct natstr *np;
+    struct bp *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;
-    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;
-    *taxes = 0;
-    *Ncivs = 0;
+    int etu = etu_per_update;
+
+    memset(p_sect, 0, sizeof(**p_sect) * (SCT_BUDG_MAX+1) * 2);
+    *taxes = *Ncivs = *Nuws = *bars = *Nbars = *mil = 0;
+    *ships = *sbuild = *nsbuild = *smaint = 0;
+    *units = *lbuild = *nlbuild = *lmaint = 0;
+    *planes = *pbuild = *npbuild = *pmaint = 0;
+
     np = getnatp(player->cnum);
-    bp = (int *)calloc(WORLD_X * WORLD_Y * 8, sizeof(int));
-    for (n=0; NULL != (sp = getsectid(n)) ;n++){
-       fill_update_array(bp, sp);
+    bp = bp_alloc();
+    for (n = 0; NULL != (sp = getsectid(n)); n++) {
+       bp_set_from_sect(bp, sp);
        if (sp->sct_own == player->cnum) {
            sp->sct_updated = 0;
            tax(sp, np, etu, &pop, &civ_tax, &uw_tax, &mil_pay);
-           getvec(VT_ITEM, vec, (s_char *)sp, EF_SECTOR);
-           *Ncivs += vec[I_CIVIL];
-           *Nuws += vec[I_UW];
+           *Ncivs += sp->sct_item[I_CIVIL];
+           *Nuws += sp->sct_item[I_UW];
            *taxes += civ_tax + uw_tax;
            *mil += mil_pay;
            if (sp->sct_type == SCT_BANK) {
                *bars += bank_income(sp, etu);
-               *Nbars += vec[I_BAR];
+               *Nbars += sp->sct_item[I_BAR];
            }
        }
     }
     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++)
-           if (np->nat_priorities[z] == y)
-               switch(z){
-               case PRI_SMAINT:
-                   tmp_money = lnd_money[player->cnum];
-                   *ships=prod_ship(etu, player->cnum,bp,0);
-                   *smaint = lnd_money[player->cnum] - tmp_money;
-                   sm=1;
-                   break;
-               case PRI_SBUILD:
-                   tmp_money = sea_money[player->cnum];
-                   *nsbuild=prod_ship(etu, player->cnum,bp,1);
-                   *sbuild = sea_money[player->cnum] - tmp_money;
-                   sb=1;
-                   break;
-               case PRI_LMAINT:
-                   tmp_money = lnd_money[player->cnum];
-                   *units=prod_land(etu, player->cnum,bp,0);
-                   *lmaint = lnd_money[player->cnum] - tmp_money;
-                   lm=1;
-                   break;
-               case PRI_LBUILD:
-                   tmp_money = lnd_money[player->cnum];
-                   *nlbuild=prod_land(etu, player->cnum,bp,1);
-                   *lbuild = lnd_money[player->cnum] - tmp_money;
-                   lb=1;
-                   break;
-               case PRI_PMAINT:
-                   tmp_money = air_money[player->cnum];
-                   *planes=prod_plane(etu, player->cnum,bp,0);
-                   *pmaint = air_money[player->cnum] - tmp_money;
-                   pm=1;
-                   break;
-               case PRI_PBUILD:
-                   tmp_money = air_money[player->cnum];
-                   *npbuild=prod_plane(etu, player->cnum,bp,1);
-                   *pbuild = air_money[player->cnum] - tmp_money;
-                   pb=1;
-                   break;
-               default:
-                   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);
-       *smaint = sea_money[player->cnum] - tmp_money;
-    }
-    if (!sb) {
-       tmp_money = sea_money[player->cnum];
-       *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);
-       *lmaint = lnd_money[player->cnum] - tmp_money;
-    }
-    if (!lb) {
-       tmp_money = lnd_money[player->cnum];
-       *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);
-       *pmaint = air_money[player->cnum] - tmp_money;
-    }
-    if (!pb) {
-       tmp_money = air_money[player->cnum];
-       *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);
-    
-    lnd_money[player->cnum] = sea_money[player->cnum] = 0;
+    *mil += (int)(np->nat_reserve * money_res * etu);
+
+    *mil += upd_slmilcosts(np->nat_cnum, etu);
+
+    /* Maintain ships */
+    sea_money[player->cnum] = 0;
+    *ships = prod_ship(etu, player->cnum, bp, 0);
+    *smaint = sea_money[player->cnum];
+
+    /* Maintain planes */
     air_money[player->cnum] = 0;
-    free(bp);
-}
+    *planes = prod_plane(etu, player->cnum, bp, 0);
+    *pmaint = air_money[player->cnum];
 
-int
-goodsect(char c)
-{
-       register int x;
+    /* Maintain land units */
+    lnd_money[player->cnum] = 0;
+    *units = prod_land(etu, player->cnum, bp, 0);
+    *lmaint = lnd_money[player->cnum];
 
-       for(x=4;x<SCT_MAXDEF+2;x++)
-               if (dchr[x].d_mnem == c)
-                       return 1;
+    /* Produce */
+    produce_sect(player->cnum, etu, bp, p_sect);
 
-       return 0;
-}
+    /* Build ships */
+    sea_money[player->cnum] = 0;
+    *nsbuild = prod_ship(etu, player->cnum, bp, 1);
+    *sbuild = sea_money[player->cnum];
+    sea_money[player->cnum] = 0;
 
-s_char *
-dotsprintf(s_char *buf, s_char *format, int data)
-{
-       sprintf(buf, format, data);
-       return (s_char *)memset(buf, '.', strspn(buf, " "));
+    /* Build planes */
+    air_money[player->cnum] = 0;
+    *npbuild = prod_plane(etu, player->cnum, bp, 1);
+    *pbuild = air_money[player->cnum];
+    air_money[player->cnum] = 0;
+
+    /* Build land units */
+    lnd_money[player->cnum] = 0;
+    *nlbuild = prod_land(etu, player->cnum, bp, 1);
+    *lbuild = lnd_money[player->cnum];
+    lnd_money[player->cnum] = 0;
+
+    free(bp);
 }
 
-void
-prexpense(long int cash, int *expensesp, s_char priority, int amount)
+static char *
+dotsprintf(char *buf, char *format, int data)
 {
-       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);
-       }
+    sprintf(buf, format, data);
+    return memset(buf, '.', strspn(buf, " "));
 }
-