Update copyright notice.

[empserver] / src / lib / update / plane.c

diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c
index 30eb3a6a8f15baa3736d18af253eed8db500c422..2aba379814bb8824ab9b8d6d454036f4739f666c 100644 (file)
--- a/src/lib/update/plane.c
+++ b/src/lib/update/plane.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -59,7 +59,6 @@ prod_plane(int etus, int natnum, int *bp, int buildem)
 
                 /* Build = 1, maintain =0 */
 {
-    extern long air_money[MAXNOC];
     register struct plnstr *pp;
     register struct plchrstr *plp;
     struct natstr *np;
@@ -67,7 +66,6 @@ prod_plane(int etus, int natnum, int *bp, int buildem)
     int left, build;
     int lcm_needed, hcm_needed;
     int mil_needed;
-    int svec[I_MAX + 1];
     int mvec[I_MAX + 1];
     int n, k = 0;
     struct shpstr *shp;
@@ -127,7 +125,6 @@ prod_plane(int etus, int natnum, int *bp, int buildem)
        np = getnatp(pp->pln_own);
        desc = &plchr[(int)pp->pln_type];
        sp = getsectp(pp->pln_x, pp->pln_y);
-       getvec(VT_ITEM, svec, (s_char *)sp, EF_SECTOR);
        mult = 1;
        if (np->nat_level[NAT_TLEV] < pp->pln_tech * 0.85)
            mult = 2;
@@ -179,12 +176,10 @@ prod_plane(int etus, int natnum, int *bp, int buildem)
                avail = gt_bg_nmbr(bp, sp, I_MAX + 1) * 100;
 
            if (pp->pln_ship >= 0) {
-               int vec[I_MAX + 1];
                shp = getshipp(pp->pln_ship);
-               getvec(VT_ITEM, vec, (s_char *)shp, EF_SHIP);
-               avail += (etus * vec[I_MILIT] / 2);
+               avail += (etus * shp->shp_item[I_MILIT] / 2);
            }
-           w_p_eff = 20 + (desc->pl_lcm + 2 * desc->pl_hcm);
+           w_p_eff = PLN_BLD_WORK(desc->pl_lcm, desc->pl_hcm);
            delta = roundavg((double)avail / w_p_eff);
            if (delta <= 0)
                continue;