]> git.pond.sub.org Git - empserver/blobdiff - src/lib/commands/buil.c
Remove unused members of struct lndstr, lonstr, nukstr, trtstr
[empserver] / src / lib / commands / buil.c
index 56f8c54ab4b2f6de771c642ee26129b9baf42244..9ebe6f6ee3ea6adc146f67809e9882838da3df76 100644 (file)
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
  *  ---
  *
  *  buil.c: Build ships, nukes, bridges, planes, land units, bridge towers
- * 
+ *
  *  Known contributors to this file:
  *      Steve McClure, 1998-2000
- *      Markus Armbruster, 2004-2005
+ *      Markus Armbruster, 2004-2009
  */
 
 #include <config.h>
 
 #include <limits.h>
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "sect.h"
-#include "nat.h"
-#include "ship.h"
+#include "commands.h"
+#include "game.h"
 #include "land.h"
+#include "lost.h"
+#include "map.h"
 #include "nuke.h"
+#include "optlist.h"
+#include "path.h"
+#include "plague.h"
 #include "plane.h"
-#include "xy.h"
-#include "nsc.h"
+#include "ship.h"
 #include "treaty.h"
-#include "file.h"
-#include "path.h"
-#include "optlist.h"
-#include "commands.h"
+#include "unit.h"
 
 static int build_nuke(struct sctstr *sp,
-                     struct nchrstr *np, short *vec);
+                     struct nchrstr *np, short *vec, int tlev);
 static int build_ship(struct sctstr *sp,
-                     struct mchrstr *mp, short *vec,
-                     int tlev);
+                     struct mchrstr *mp, short *vec, int tlev);
 static int build_land(struct sctstr *sp,
-                     struct lchrstr *lp, short *vec,
-                     int tlev);
+                     struct lchrstr *lp, short *vec, int tlev);
 static int build_bridge(struct sctstr *sp, short *vec);
 static int build_tower(struct sctstr *sp, short *vec);
 static int build_plane(struct sctstr *sp,
-                      struct plchrstr *pp, short *vec,
-                      int tlev);
-
-static int cash;               /* static ok */
+                      struct plchrstr *pp, short *vec, int tlev);
+static int build_can_afford(double, char *);
 
 /*
  * build <WHAT> <SECTS> <TYPE|DIR|MEG> [NUMBER]
@@ -82,170 +74,174 @@ buil(void)
     int tlev;
     int rlev;
     int type;
-    int what;
+    char what;
     struct lchrstr *lp;
     struct mchrstr *mp;
     struct plchrstr *pp;
     struct nchrstr *np;
-    s_char *p;
+    char *p;
     int gotsect = 0;
     int built;
-    int number = 1, x;
-    int asked = 0;
-    s_char buf[1024];
+    int number;
+    char buf[1024];
 
     natp = getnatp(player->cnum);
-    if ((p =
-        getstarg(player->argp[1],
-                 "Build (ship, nuke, bridge, plane, land unit, tower)? ",
-                 buf)) == 0)
+    p = getstarg(player->argp[1],
+                "Build (ship, nuke, bridge, plane, land unit, tower)? ",
+                buf);
+    if (!p)
        return RET_SYN;
     what = *p;
 
-    for (x = 0; x < number; x++) {
-       if (!snxtsct(&nstr, player->argp[2])) {
-           pr("Bad sector specification.\n");
+    if (!snxtsct(&nstr, player->argp[2])) {
+       pr("Bad sector specification.\n");
+       return RET_SYN;
+    }
+    tlev = (int)natp->nat_level[NAT_TLEV];
+    rlev = (int)natp->nat_level[NAT_RLEV];
+
+    switch (what) {
+    case 'p':
+       p = getstarg(player->argp[3], "Plane type? ", buf);
+       if (!p || !*p)
            return RET_SYN;
+       type = ef_elt_byname(EF_PLANE_CHR, p);
+       if (type >= 0) {
+           pp = &plchr[type];
+           rqtech = pp->pl_tech;
+           if (rqtech > tlev)
+               type = -1;
        }
-       tlev = (int)natp->nat_level[NAT_TLEV];
-       rlev = (int)natp->nat_level[NAT_RLEV];
-
-       switch (what) {
-       case 'p':
-           p = getstarg(player->argp[3], "Plane type? ", buf);
-           if (p == 0 || *p == 0)
-               return RET_SYN;
-           type = typematch(p, EF_PLANE);
-           if (type >= 0) {
-               pp = &plchr[type];
-               rqtech = pp->pl_tech;
-               if (rqtech > tlev)
-                   type = -1;
-           }
-           if (type < 0) {
-               pr("You can't build that!\n");
-               pr("Use `show plane build %d' to show types you can build.\n", tlev);
-               return RET_FAIL;
-           }
-           break;
-       case 's':
-           p = getstarg(player->argp[3], "Ship type? ", buf);
-           if (p == 0 || *p == 0)
-               return RET_SYN;
-           type = typematch(p, EF_SHIP);
-           if (type >= 0) {
-               mp = &mchr[type];
-               rqtech = mp->m_tech;
-               if (rqtech > tlev)
-                   type = -1;
-               if ((mp->m_flags & M_TRADE) && !opt_TRADESHIPS)
-                   type = -1;
-           }
-           if (type < 0) {
-               pr("You can't build that!\n");
-               pr("Use `show ship build %d' to show types you can build.\n", tlev);
-               return RET_FAIL;
-           }
-           break;
-       case 'l':
-           p = getstarg(player->argp[3], "Land unit type? ", buf);
-           if (p == 0 || *p == 0)
-               return RET_SYN;
-           type = typematch(p, EF_LAND);
-           if (type >= 0) {
-               lp = &lchr[type];
-               rqtech = lp->l_tech;
-               if (rqtech > tlev)
-                   type = -1;
-               if ((lp->l_flags & L_SPY) && !opt_LANDSPIES)
-                   type = -1;
-           }
-           if (type < 0) {
-               pr("You can't build that!\n");
-               pr("Use `show land build %d' to show types you can build.\n", tlev);
-               return RET_FAIL;
-           }
-           break;
-       case 'b':
-           if (natp->nat_level[NAT_TLEV] + 0.005 < buil_bt) {
-               pr("Building a span requires a tech of %.0f\n", buil_bt);
-               return 2;
-           }
-           break;
-       case 't':
-           if (!opt_BRIDGETOWERS) {
-               pr("Bridge tower building is disabled.\n");
-               return RET_FAIL;
-           }
-           if (natp->nat_level[NAT_TLEV] + 0.005 < buil_tower_bt) {
-               pr("Building a tower requires a tech of %.0f\n",
-                  buil_tower_bt);
-               return 2;
-           }
-           break;
-       case 'n':
-           if (!ef_nelem(EF_NUKE_CHR)) {
-               pr("There are no nukes in this game.\n");
-               return RET_FAIL;
-           }
-           p = getstarg(player->argp[3], "Nuke type? ", buf);
-           if (p == 0 || *p == 0)
-               return RET_SYN;
-           type = typematch(p, EF_NUKE);
-           if (type >= 0) {
-               np = &nchr[type];
-               rqtech = np->n_tech;
-               if (rqtech > tlev
-                   || (drnuke_const > MIN_DRNUKE_CONST &&
-                       np->n_tech * drnuke_const > rlev))
-                   type = -1;
-           }
-           if (type < 0) {
-               int tt = tlev;
-               if (drnuke_const > MIN_DRNUKE_CONST)
-                   tt = (tlev < (rlev / drnuke_const) ? (int)tlev :
-                         (int)(rlev / drnuke_const));
-               pr("You can't build that!\n");
-               pr("Use `show nuke build %d' to show types you can build.\n", tt);
-               return RET_FAIL;
-           }
-           break;
-       default:
+       if (type < 0) {
+           pr("You can't build that!\n");
+           pr("Use `show plane build %d' to show types you can build.\n",
+              tlev);
+           return RET_FAIL;
+       }
+       break;
+    case 's':
+       p = getstarg(player->argp[3], "Ship type? ", buf);
+       if (!p || !*p)
+           return RET_SYN;
+       type = ef_elt_byname(EF_SHIP_CHR, p);
+       if (type >= 0) {
+           mp = &mchr[type];
+           rqtech = mp->m_tech;
+           if (rqtech > tlev)
+               type = -1;
+           if ((mp->m_flags & M_TRADE) && !opt_TRADESHIPS)
+               type = -1;
+       }
+       if (type < 0) {
            pr("You can't build that!\n");
+           pr("Use `show ship build %d' to show types you can build.\n",
+              tlev);
            return RET_FAIL;
        }
-       if (what != 'b' && what != 't') {
-           if (player->argp[4]) {
-               if (atoi(player->argp[4]) > 20 && !asked) {
-                   s_char bstr[80];
-                   asked = 1;
-                   (void)sprintf(bstr,
-                                 "Are you sure that you want to build %s of them? ",
-                                 player->argp[4]);
-                   p = getstarg(player->argp[6], bstr, buf);
-                   if (p == 0 || *p != 'y')
-                       return RET_SYN;
-               }
-               number = atoi(player->argp[4]);
+       break;
+    case 'l':
+       p = getstarg(player->argp[3], "Land unit type? ", buf);
+       if (!p || !*p)
+           return RET_SYN;
+       type = ef_elt_byname(EF_LAND_CHR, p);
+       if (type >= 0) {
+           lp = &lchr[type];
+           rqtech = lp->l_tech;
+           if (rqtech > tlev)
+               type = -1;
+           if ((lp->l_flags & L_SPY) && !opt_LANDSPIES)
+               type = -1;
+       }
+       if (type < 0) {
+           pr("You can't build that!\n");
+           pr("Use `show land build %d' to show types you can build.\n",
+              tlev);
+           return RET_FAIL;
+       }
+       break;
+    case 'b':
+       if (natp->nat_level[NAT_TLEV] + 0.005 < buil_bt) {
+           pr("Building a span requires a tech of %.0f\n", buil_bt);
+           return RET_FAIL;
+       }
+       break;
+    case 't':
+       if (!opt_BRIDGETOWERS) {
+           pr("Bridge tower building is disabled.\n");
+           return RET_FAIL;
+       }
+       if (natp->nat_level[NAT_TLEV] + 0.005 < buil_tower_bt) {
+           pr("Building a tower requires a tech of %.0f\n",
+              buil_tower_bt);
+           return RET_FAIL;
+       }
+       break;
+    case 'n':
+       if (!ef_nelem(EF_NUKE_CHR)) {
+           pr("There are no nukes in this game.\n");
+           return RET_FAIL;
+       }
+       p = getstarg(player->argp[3], "Nuke type? ", buf);
+       if (!p || !*p)
+           return RET_SYN;
+       type = ef_elt_byname(EF_NUKE_CHR, p);
+       if (type >= 0) {
+           np = &nchr[type];
+           rqtech = np->n_tech;
+           if (rqtech > tlev
+               || (drnuke_const > MIN_DRNUKE_CONST &&
+                   np->n_tech * drnuke_const > rlev))
+               type = -1;
+       }
+       if (type < 0) {
+           int tt = tlev;
+           if (drnuke_const > MIN_DRNUKE_CONST)
+               tt = (tlev < (rlev / drnuke_const) ? (int)tlev :
+                     (int)(rlev / drnuke_const));
+           pr("You can't build that!\n");
+           pr("Use `show nuke build %d' to show types you can build.\n",
+              tt);
+           return RET_FAIL;
+       }
+       break;
+    default:
+       pr("You can't build that!\n");
+       return RET_SYN;
+    }
+
+    number = 1;
+    if (what != 'b' && what != 't') {
+       if (player->argp[4]) {
+           number = atoi(player->argp[4]);
+           if (number > 20) {
+               char bstr[80];
+               sprintf(bstr,
+                       "Are you sure that you want to build %s of them? ",
+                       player->argp[4]);
+               p = getstarg(player->argp[6], bstr, buf);
+               if (!p || *p != 'y')
+                   return RET_SYN;
            }
        }
-       if (what != 'b' && what != 'n' && what != 't') {
-           if (player->argp[5]) {
-               tlev = atoi(player->argp[5]);
-               if (tlev > natp->nat_level[NAT_TLEV] && !player->god) {
-                   pr("Your tech level is only %d.\n",
-                      (int)natp->nat_level[NAT_TLEV]);
-                   return RET_FAIL;
-               }
-               if (rqtech > tlev) {
-                   pr("Required tech is %d.\n", rqtech);
-                   return RET_FAIL;
-               }
-               pr("building with tech level %d.\n", tlev);
-           } else
-               tlev = (int)natp->nat_level[NAT_TLEV];
+    }
+
+    if (what != 'b' && what != 'n' && what != 't') {
+       if (player->argp[5]) {
+           tlev = atoi(player->argp[5]);
+           if (tlev > natp->nat_level[NAT_TLEV] && !player->god) {
+               pr("Your tech level is only %d.\n",
+                  (int)natp->nat_level[NAT_TLEV]);
+               return RET_FAIL;
+           }
+           if (rqtech > tlev) {
+               pr("Required tech is %d.\n", rqtech);
+               return RET_FAIL;
+           }
+           pr("building with tech level %d.\n", tlev);
        }
-       cash = natp->nat_money;
+    }
+
+    while (number-- > 0) {
        while (nxtsct(&nstr, &sect)) {
            gotsect++;
            if (!player->owner)
@@ -264,19 +260,20 @@ buil(void)
                built = build_tower(&sect, sect.sct_item);
                break;
            case 'n':
-               built = build_nuke(&sect, np, sect.sct_item);
+               built = build_nuke(&sect, np, sect.sct_item, tlev);
                break;
            case 'p':
                built = build_plane(&sect, pp, sect.sct_item, tlev);
                break;
            default:
-               CANT_HAPPEN("Bad WHAT");
+               CANT_REACH();
                return RET_FAIL;
            }
            if (built) {
                putsect(&sect);
            }
        }
+       snxtsct_rewind(&nstr);
     }
     if (!gotsect) {
        pr("Bad sector specification.\n");
@@ -285,18 +282,18 @@ buil(void)
 }
 
 static int
-build_ship(struct sctstr *sp, struct mchrstr *mp,
-          short *vec, int tlev)
+build_ship(struct sctstr *sp, struct mchrstr *mp, short *vec, int tlev)
 {
     struct shpstr ship;
     struct nstr_item nstr;
-    int avail, cost, i;
-    float eff = SHIP_MINEFF / 100.0;
+    int avail;
+    double cost;
+    double eff = SHIP_MINEFF / 100.0;
     int lcm, hcm;
     int freeship = 0;
 
-    hcm = roundavg((double)mp->m_hcm * eff);
-    lcm = roundavg((double)mp->m_lcm * eff);
+    hcm = roundavg(mp->m_hcm * eff);
+    lcm = roundavg(mp->m_lcm * eff);
 
     if (sp->sct_type != SCT_HARBR) {
        pr("Ships must be built in harbours.\n");
@@ -319,18 +316,15 @@ build_ship(struct sctstr *sp, struct mchrstr *mp,
        pr(" (%d available work required)\n", avail);
        return 0;
     }
-    cost = mp->m_cost * SHIP_MINEFF / 100;
-    if (cash < cost) {
-       pr("Not enough money left to build a %s\n", mp->m_name);
+    cost = mp->m_cost * SHIP_MINEFF / 100.0;
+    if (!build_can_afford(cost, mp->m_name))
        return 0;
-    }
     if (!trechk(player->cnum, 0, NEWSHP))
        return 0;
     if (!check_sect_ok(sp))
        return 0;
     sp->sct_avail -= avail;
     player->dolcost += cost;
-    cash -= cost;
     snxtitem_all(&nstr, EF_SHIP);
     while (nxtitem(&nstr, &ship)) {
        if (ship.shp_own == 0) {
@@ -341,59 +335,33 @@ build_ship(struct sctstr *sp, struct mchrstr *mp,
     if (freeship == 0) {
        ef_extend(EF_SHIP, 50);
     }
-    memset(&ship, 0, sizeof(struct shpstr));
+    ef_blank(EF_SHIP, nstr.cur, &ship);
     ship.shp_x = sp->sct_x;
     ship.shp_y = sp->sct_y;
-    ship.shp_destx[0] = sp->sct_x;
-    ship.shp_desty[0] = sp->sct_y;
-    ship.shp_destx[1] = sp->sct_x;
-    ship.shp_desty[1] = sp->sct_y;
-    ship.shp_autonav = 0;
-    /* new code for autonav, Chad Zabel 1-15-94 */
-    for (i = 0; i < TMAX; ++i) {
-       ship.shp_tstart[i] = I_NONE;
-       ship.shp_tend[i] = I_NONE;
-       ship.shp_lstart[i] = 0;
-       ship.shp_lend[i] = 0;
-    }
-    ship.shp_mission = 0;
     ship.shp_own = player->cnum;
     ship.shp_type = mp - mchr;
     ship.shp_effic = SHIP_MINEFF;
     if (opt_MOB_ACCESS) {
-       time(&ship.shp_access);
+       game_tick_to_now(&ship.shp_access);
        ship.shp_mobil = -(etu_per_update / sect_mob_neg_factor);
     } else {
        ship.shp_mobil = 0;
     }
-    ship.shp_uid = nstr.cur;
-    ship.shp_nplane = 0;
-    ship.shp_nland = 0;
-    ship.shp_nxlight = 0;
-    ship.shp_nchoppers = 0;
-    ship.shp_fleet = ' ';
     memset(ship.shp_item, 0, sizeof(ship.shp_item));
     ship.shp_pstage = PLG_HEALTHY;
     ship.shp_ptime = 0;
-    ship.shp_mobquota = 0;
-    *ship.shp_path = 0;
-    ship.shp_follow = nstr.cur;
     ship.shp_name[0] = 0;
     ship.shp_orig_own = player->cnum;
     ship.shp_orig_x = sp->sct_x;
     ship.shp_orig_y = sp->sct_y;
-    ship.shp_fuel = mchr[(int)ship.shp_type].m_fuelc;
-    ship.shp_rflags = 0;
-    memset(ship.shp_rpath, 0, sizeof(ship.shp_rpath));
     shp_set_tech(&ship, tlev);
+    unit_wipe_orders((struct empobj *)&ship);
 
     vec[I_LCM] -= lcm;
     vec[I_HCM] -= hcm;
 
     if (sp->sct_pstage == PLG_INFECT)
        ship.shp_pstage = PLG_EXPOSED;
-    makenotlost(EF_SHIP, ship.shp_own, ship.shp_uid, ship.shp_x,
-               ship.shp_y);
     putship(ship.shp_uid, &ship);
     pr("%s", prship(&ship));
     pr(" built in sector %s\n", xyas(sp->sct_x, sp->sct_y, player->cnum));
@@ -401,25 +369,25 @@ build_ship(struct sctstr *sp, struct mchrstr *mp,
 }
 
 static int
-build_land(struct sctstr *sp, struct lchrstr *lp,
-          short *vec, int tlev)
+build_land(struct sctstr *sp, struct lchrstr *lp, short *vec, int tlev)
 {
     struct lndstr land;
     struct nstr_item nstr;
-    int avail, cost;
-    float eff = LAND_MINEFF / 100.0;
+    int avail;
+    double cost;
+    double eff = LAND_MINEFF / 100.0;
     int mil, lcm, hcm, gun, shell;
     int freeland = 0;
 
 #if 0
-    mil = roundavg(((double)lp->l_mil * eff));
-    shell = roundavg(((double)lp->l_shell * eff));
-    gun = roundavg(((double)lp->l_gun * eff));
+    mil = roundavg(lp->l_mil * eff);
+    shell = roundavg(lp->l_shell * eff);
+    gun = roundavg(lp->l_gun * eff);
 #else
     mil = shell = gun = 0;
 #endif
-    hcm = roundavg(((double)lp->l_hcm * eff));
-    lcm = roundavg(((double)lp->l_lcm * eff));
+    hcm = roundavg(lp->l_hcm * eff);
+    lcm = roundavg(lp->l_lcm * eff);
 
     if (sp->sct_type != SCT_HEADQ) {
        pr("Land Units must be built in headquarters.\n");
@@ -463,14 +431,11 @@ build_land(struct sctstr *sp, struct lchrstr *lp,
        pr(" (%d available work required)\n", avail);
        return 0;
     }
-    cost = lp->l_cost * LAND_MINEFF / 100;
-    if (cash < cost) {
-       pr("Not enough money left to build a %s\n", lp->l_name);
+    cost = lp->l_cost * LAND_MINEFF / 100.0;
+    if (!build_can_afford(cost, lp->l_name))
        return 0;
-    }
     sp->sct_avail -= avail;
     player->dolcost += cost;
-    cash -= cost;
     snxtitem_all(&nstr, EF_LAND);
     while (nxtitem(&nstr, &land)) {
        if (land.lnd_own == 0) {
@@ -481,36 +446,26 @@ build_land(struct sctstr *sp, struct lchrstr *lp,
     if (freeland == 0) {
        ef_extend(EF_LAND, 50);
     }
-    memset(&land, 0, sizeof(struct lndstr));
+    ef_blank(EF_LAND, nstr.cur, &land);
     land.lnd_x = sp->sct_x;
     land.lnd_y = sp->sct_y;
     land.lnd_own = player->cnum;
-    land.lnd_mission = 0;
     land.lnd_type = lp - lchr;
     land.lnd_effic = LAND_MINEFF;
     if (opt_MOB_ACCESS) {
-       time(&land.lnd_access);
+       game_tick_to_now(&land.lnd_access);
        land.lnd_mobil = -(etu_per_update / sect_mob_neg_factor);
     } else {
        land.lnd_mobil = 0;
     }
-    land.lnd_uid = nstr.cur;
-    land.lnd_army = ' ';
-    land.lnd_flags = 0;
     land.lnd_ship = -1;
     land.lnd_land = -1;
-    land.lnd_nland = 0;
     land.lnd_harden = 0;
-    land.lnd_retreat = morale_base;
-    land.lnd_fuel = lp->l_fuelc;
-    land.lnd_nxlight = 0;
-    land.lnd_rflags = 0;
-    memset(land.lnd_rpath, 0, sizeof(land.lnd_rpath));
-    land.lnd_rad_max = 0;
     memset(land.lnd_item, 0, sizeof(land.lnd_item));
     land.lnd_pstage = PLG_HEALTHY;
     land.lnd_ptime = 0;
     lnd_set_tech(&land, tlev);
+    unit_wipe_orders((struct empobj *)&land);
 
     vec[I_LCM] -= lcm;
     vec[I_HCM] -= hcm;
@@ -521,8 +476,6 @@ build_land(struct sctstr *sp, struct lchrstr *lp,
     if (sp->sct_pstage == PLG_INFECT)
        land.lnd_pstage = PLG_EXPOSED;
     putland(nstr.cur, &land);
-    makenotlost(EF_LAND, land.lnd_own, land.lnd_uid, land.lnd_x,
-               land.lnd_y);
     pr("%s", prland(&land));
     pr(" built in sector %s\n", xyas(sp->sct_x, sp->sct_y, player->cnum));
     return 1;
@@ -536,8 +489,8 @@ build_bridge(struct sctstr *sp, short *vec)
     int newx, newy;
     int avail;
     int nx, ny, i, good = 0;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (opt_EASY_BRIDGES == 0) {       /* must have a bridge head or tower */
        if (sp->sct_type != SCT_BTOWER) {
@@ -562,11 +515,8 @@ build_bridge(struct sctstr *sp, short *vec)
        return 0;
     }
 
-    if (cash < buil_bc) {
-       pr("A span costs $%.2f to build; ", buil_bc);
-       pr("you only have %d.\n", cash);
+    if (!build_can_afford(buil_bc, dchr[SCT_BSPAN].d_name))
        return 0;
-    }
     avail = (SCT_BLD_WORK(0, buil_bh) * SCT_MINEFF + 99) / 100;
     if (sp->sct_avail < avail) {
        pr("Not enough available work in %s to build a bridge\n",
@@ -579,8 +529,8 @@ build_bridge(struct sctstr *sp, short *vec)
           xyas(sp->sct_x, sp->sct_y, player->cnum));
        nav_map(sp->sct_x, sp->sct_y, 1);
     }
-    if (!(p = getstarg(player->argp[3], "build span in what direction? ", buf))
-       || !*p) {
+    p = getstarg(player->argp[3], "build span in what direction? ", buf);
+    if (!p || !*p) {
        return 0;
     }
     /* Sanity check time */
@@ -589,7 +539,7 @@ build_bridge(struct sctstr *sp, short *vec)
 
     if ((val = chkdir(*p, DIR_FIRST, DIR_LAST)) < 0) {
        pr("'%c' is not a valid direction...\n", *p);
-       direrr(0, 0, 0);
+       direrr(NULL, NULL, NULL);
        return 0;
     }
     newx = sp->sct_x + diroff[val][0];
@@ -617,17 +567,14 @@ build_bridge(struct sctstr *sp, short *vec)
     }                          /* end EASY_BRIDGES */
     sp->sct_avail -= avail;
     player->dolcost += buil_bc;
-    cash -= buil_bc;
     sect.sct_type = SCT_BSPAN;
     sect.sct_newtype = SCT_BSPAN;
     sect.sct_effic = SCT_MINEFF;
     sect.sct_road = 0;
     sect.sct_rail = 0;
     sect.sct_defense = 0;
-    if (!opt_DEFENSE_INFRA)
-       sect.sct_defense = sect.sct_effic;
     if (opt_MOB_ACCESS) {
-       time(&sect.sct_access);
+       game_tick_to_now(&sect.sct_access);
        sect.sct_mobil = -(etu_per_update / sect_mob_neg_factor);
     } else {
        sect.sct_mobil = 0;
@@ -643,10 +590,12 @@ build_bridge(struct sctstr *sp, short *vec)
 }
 
 static int
-build_nuke(struct sctstr *sp, struct nchrstr *np,
-          short *vec)
+build_nuke(struct sctstr *sp, struct nchrstr *np, short *vec, int tlev)
 {
+    struct nukstr nuke;
+    struct nstr_item nstr;
     int avail;
+    int freenuke;
 
     if (sp->sct_type != SCT_NUKE && !player->god) {
        pr("Nuclear weapons must be built in nuclear plants.\n");
@@ -665,10 +614,8 @@ build_nuke(struct sctstr *sp, struct nchrstr *np,
           np->n_hcm, np->n_lcm, np->n_oil, np->n_rad);
        return 0;
     }
-    if (cash < np->n_cost) {
-       pr("You need $%d, you only have %d.\n", np->n_cost, cash);
+    if (!build_can_afford(np->n_cost, np->n_name))
        return 0;
-    }
     avail = NUK_BLD_WORK(np->n_lcm, np->n_hcm, np->n_oil, np->n_rad);
     /*
      * XXX when nukes turn into units (or whatever), then
@@ -687,34 +634,55 @@ build_nuke(struct sctstr *sp, struct nchrstr *np,
        return 0;
     sp->sct_avail -= avail;
     player->dolcost += np->n_cost;
-    cash -= np->n_cost;
-    nuk_add(sp->sct_x, sp->sct_y, np - nchr, 1);
+    snxtitem_all(&nstr, EF_NUKE);
+    freenuke = 0;
+    while (nxtitem(&nstr, &nuke)) {
+       if (nuke.nuk_own == 0) {
+           freenuke++;
+           break;
+       }
+    }
+    if (freenuke == 0) {
+       ef_extend(EF_NUKE, 50);
+    }
+    ef_blank(EF_NUKE, nstr.cur, &nuke);
+    nuke.nuk_x = sp->sct_x;
+    nuke.nuk_y = sp->sct_y;
+    nuke.nuk_own = sp->sct_own;
+    nuke.nuk_type = np - nchr;
+    nuke.nuk_effic = 100;
+    nuke.nuk_plane = -1;
+    nuke.nuk_tech = tlev;
+    unit_wipe_orders((struct empobj *)&nuke);
+
     vec[I_HCM] -= np->n_hcm;
     vec[I_LCM] -= np->n_lcm;
     vec[I_OIL] -= np->n_oil;
     vec[I_RAD] -= np->n_rad;
-    pr("%s warhead created in %s\n", np->n_name,
+
+    putnuke(nuke.nuk_uid, &nuke);
+    pr("%s created in %s\n", prnuke(&nuke),
        xyas(sp->sct_x, sp->sct_y, player->cnum));
     return 1;
 }
 
 static int
-build_plane(struct sctstr *sp, struct plchrstr *pp,
-           short *vec, int tlev)
+build_plane(struct sctstr *sp, struct plchrstr *pp, short *vec, int tlev)
 {
     struct plnstr plane;
-    int avail, cost;
     struct nstr_item nstr;
-    float eff = PLANE_MINEFF / 100.0;
+    int avail;
+    double cost;
+    double eff = PLANE_MINEFF / 100.0;
     int hcm, lcm, mil;
-    int freeplane = 0;
+    int freeplane;
 
-    mil = roundavg(((double)pp->pl_crew * eff));
+    mil = roundavg(pp->pl_crew * eff);
     /* Always use at least 1 mil to build a plane */
     if (mil == 0 && pp->pl_crew > 0)
        mil = 1;
-    hcm = roundavg(((double)pp->pl_hcm * eff));
-    lcm = roundavg(((double)pp->pl_lcm * eff));
+    hcm = roundavg(pp->pl_hcm * eff);
+    lcm = roundavg(pp->pl_lcm * eff);
     if (sp->sct_type != SCT_AIRPT && !player->god) {
        pr("Planes must be built in airports.\n");
        return 0;
@@ -736,11 +704,9 @@ build_plane(struct sctstr *sp, struct plchrstr *pp,
        pr(" (%d available work required)\n", avail);
        return 0;
     }
-    cost = pp->pl_cost * PLANE_MINEFF / 100;
-    if (cash < cost) {
-       pr("Not enough money left to build a %s\n", pp->pl_name);
+    cost = pp->pl_cost * PLANE_MINEFF / 100.0;
+    if (!build_can_afford(cost, pp->pl_name))
        return 0;
-    }
     if (vec[I_MILIT] < mil || (vec[I_MILIT] == 0 && pp->pl_crew > 0)) {
        pr("Not enough military for crew in %s\n",
           xyas(sp->sct_x, sp->sct_y, player->cnum));
@@ -752,7 +718,6 @@ build_plane(struct sctstr *sp, struct plchrstr *pp,
        return 0;
     sp->sct_avail -= avail;
     player->dolcost += cost;
-    cash -= cost;
     snxtitem_all(&nstr, EF_PLANE);
     freeplane = 0;
     while (nxtitem(&nstr, &plane)) {
@@ -764,39 +729,30 @@ build_plane(struct sctstr *sp, struct plchrstr *pp,
     if (freeplane == 0) {
        ef_extend(EF_PLANE, 50);
     }
-    memset(&plane, 0, sizeof(struct plnstr));
+    ef_blank(EF_PLANE, nstr.cur, &plane);
     plane.pln_x = sp->sct_x;
     plane.pln_y = sp->sct_y;
     plane.pln_own = sp->sct_own;
     plane.pln_type = pp - plchr;
     plane.pln_effic = PLANE_MINEFF;
     if (opt_MOB_ACCESS) {
-       time(&plane.pln_access);
+       game_tick_to_now(&plane.pln_access);
        plane.pln_mobil = -(etu_per_update / sect_mob_neg_factor);
     } else {
        plane.pln_mobil = 0;
     }
-    plane.pln_mission = 0;
-    plane.pln_opx = 0;
-    plane.pln_opy = 0;
-    plane.pln_radius = 0;
     plane.pln_range = UCHAR_MAX; /* will be adjusted by pln_set_tech() */
-    plane.pln_range_max = plane.pln_range;
-    plane.pln_wing = ' ';
     plane.pln_ship = -1;
     plane.pln_land = -1;
-    plane.pln_uid = nstr.cur;
-    plane.pln_nuketype = -1;
     plane.pln_harden = 0;
     plane.pln_flags = 0;
     pln_set_tech(&plane, tlev);
+    unit_wipe_orders((struct empobj *)&plane);
 
     vec[I_LCM] -= lcm;
     vec[I_HCM] -= hcm;
     vec[I_MILIT] -= mil;
 
-    makenotlost(EF_PLANE, plane.pln_own, plane.pln_uid, plane.pln_x,
-               plane.pln_y);
     putplane(plane.pln_uid, &plane);
     pr("%s built in sector %s\n", prplane(&plane),
        xyas(sp->sct_x, sp->sct_y, player->cnum));
@@ -810,9 +766,8 @@ build_tower(struct sctstr *sp, short *vec)
     int val;
     int newx, newy;
     int avail;
-    s_char *p;
-    s_char buf[1024];
-    int good;
+    char *p;
+    char buf[1024];
     int i;
     int nx;
     int ny;
@@ -836,11 +791,8 @@ build_tower(struct sctstr *sp, short *vec)
        return 0;
     }
 
-    if (cash < buil_tower_bc) {
-       pr("A bridge tower costs $%.2f to build; ", buil_tower_bc);
-       pr("you only have %d.\n", cash);
+    if (!build_can_afford(buil_tower_bc, dchr[SCT_BTOWER].d_name))
        return 0;
-    }
     avail = (SCT_BLD_WORK(0, buil_tower_bh) * SCT_MINEFF + 99) / 100;
     if (sp->sct_avail < avail) {
        pr("Not enough available work in %s to build a bridge tower\n",
@@ -852,8 +804,8 @@ build_tower(struct sctstr *sp, short *vec)
        pr("Building from %s\n", xyas(sp->sct_x, sp->sct_y, player->cnum));
        nav_map(sp->sct_x, sp->sct_y, 1);
     }
-    if (!(p = getstarg(player->argp[3], "build tower in what direction? ", buf))
-       || !*p) {
+    p = getstarg(player->argp[3], "build tower in what direction? ", buf);
+    if (!p || !*p) {
        return 0;
     }
     /* Sanity check time */
@@ -862,7 +814,7 @@ build_tower(struct sctstr *sp, short *vec)
 
     if ((val = chkdir(*p, DIR_FIRST, DIR_LAST)) < 0) {
        pr("'%c' is not a valid direction...\n", *p);
-       direrr(0, 0, 0);
+       direrr(NULL, NULL, NULL);
        return 0;
     }
     newx = sp->sct_x + diroff[val][0];
@@ -874,7 +826,6 @@ build_tower(struct sctstr *sp, short *vec)
 
     /* Now, check.  You aren't allowed to build bridge towers
        next to land. */
-    good = 0;
     for (i = 1; i <= 6; i++) {
        struct sctstr s2;
        nx = sect.sct_x + diroff[i][0];
@@ -882,19 +833,14 @@ build_tower(struct sctstr *sp, short *vec)
        getsect(nx, ny, &s2);
        if ((s2.sct_type != SCT_WATER) &&
            (s2.sct_type != SCT_BTOWER) && (s2.sct_type != SCT_BSPAN)) {
-           good = 1;
-           break;
+           pr("Bridge towers cannot be built adjacent to land.\n");
+           pr("That sector is adjacent to land.\n");
+           return 0;
        }
     }
-    if (good) {
-       pr("Bridge towers cannot be built adjacent to land.\n");
-       pr("That sector is adjacent to land.\n");
-       return 0;
-    }
 
     sp->sct_avail -= avail;
     player->dolcost += buil_tower_bc;
-    cash -= buil_tower_bc;
     sect.sct_type = SCT_BTOWER;
     sect.sct_newtype = SCT_BTOWER;
     sect.sct_effic = SCT_MINEFF;
@@ -902,13 +848,11 @@ build_tower(struct sctstr *sp, short *vec)
     sect.sct_rail = 0;
     sect.sct_defense = 0;
     if (opt_MOB_ACCESS) {
-       time(&sect.sct_access);
+       game_tick_to_now(&sect.sct_access);
        sect.sct_mobil = -(etu_per_update / sect_mob_neg_factor);
     } else {
        sect.sct_mobil = 0;
     }
-    if (!opt_DEFENSE_INFRA)
-       sect.sct_defense = sect.sct_effic;
     sect.sct_mines = 0;
     map_set(player->cnum, sect.sct_x, sect.sct_y, dchr[SCT_BTOWER].d_mnem, 2);
     writemap(player->cnum);
@@ -918,3 +862,14 @@ build_tower(struct sctstr *sp, short *vec)
     vec[I_HCM] -= buil_tower_bh;
     return 1;
 }
+
+static int
+build_can_afford(double cost, char *what)
+{
+    struct natstr *natp = getnatp(player->cnum);
+    if (natp->nat_money < player->dolcost + cost) {
+       pr("Not enough money left to build a %s\n", what);
+       return 0;
+    }
+    return 1;
+}