Update copyright notice

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

diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c
index 22fbba389a73c9bcb4c3d1926634632d12ecfd0c..ac63743c86ecdf49defea967629ac2f1baefb2e3 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-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -35,7 +35,6 @@
 #include <config.h>
 
 #include "chance.h"
-#include "file.h"
 #include "lost.h"
 #include "nat.h"
 #include "optlist.h"
@@ -49,18 +48,15 @@ static void upd_plane(struct plnstr *, int, struct bp *, int);
 static void planerepair(struct plnstr *, struct natstr *, struct bp *,
                        int, struct budget *);
 
-void
-prod_plane(int etus, int natnum, struct bp *bp, int buildem)
-                /* Build = 1, maintain =0 */
+void prep_planes(int etus, struct bp *bp)
 {
+    int mil, i;
+    double mil_pay;
     struct plnstr *pp;
-    int i;
 
     for (i = 0; (pp = getplanep(i)); i++) {
        if (pp->pln_own == 0)
            continue;
-       if (pp->pln_own != natnum)
-           continue;
        if (pp->pln_effic < PLANE_MINEFF) {
            makelost(EF_PLANE, pp->pln_own, pp->pln_uid,
                     pp->pln_x, pp->pln_y);
@@ -68,13 +64,27 @@ prod_plane(int etus, int natnum, struct bp *bp, int buildem)
            continue;
        }
 
-       if (pln_is_in_orbit(pp)) {
-           if (!player->simulation && buildem == 0
-               && !(pp->pln_flags & PLN_SYNCHRONOUS))
-               move_sat(pp);
-           continue;
-       }
+       bp_consider_unit(bp, (struct empobj *)pp);
+       mil = plchr[pp->pln_type].pl_mat[I_MILIT];
+       /* flight pay is 5x the pay received by other military */
+       mil_pay = mil * etus * money_mil * 5;
+       nat_budget[pp->pln_own].bm[BUDG_PLN_MAINT].money += mil_pay;
+       nat_budget[pp->pln_own].money += mil_pay;
+    }
+}
+
+void
+prod_plane(int etus, struct bp *bp, int buildem)
+                /* Build = 1, maintain =0 */
+{
+    struct plnstr *pp;
+    int i;
 
+    for (i = 0; (pp = getplanep(i)); i++) {
+       if (pp->pln_own == 0)
+           continue;
+       if (bp_skip_unit(bp, (struct empobj *)pp))
+           continue;
        upd_plane(pp, etus, bp, buildem);
     }
 }
@@ -85,7 +95,8 @@ upd_plane(struct plnstr *pp, int etus, struct bp *bp, int build)
     struct budget *budget = &nat_budget[pp->pln_own];
     struct plchrstr *pcp = &plchr[pp->pln_type];
     struct natstr *np = getnatp(pp->pln_own);
-    int mult, cost, eff_lost;
+    int mult, eff_lost;
+    double cost;
 
     if (build == 1) {
        if (!pp->pln_off && budget->money >= 0)
@@ -97,7 +108,7 @@ upd_plane(struct plnstr *pp, int etus, struct bp *bp, int build)
        if (np->nat_level[NAT_TLEV] < pp->pln_tech * 0.85)
            mult = 2;
        budget->bm[BUDG_PLN_MAINT].count++;
-       cost = -(mult * etus * MIN(0.0, pcp->pl_cost * money_plane));
+       cost = mult * etus * -money_plane * pcp->pl_cost;
        if (budget->money < cost && !player->simulation) {
            eff_lost = etus / 5;
            if (pp->pln_effic - eff_lost < PLANE_MINEFF)
@@ -111,10 +122,11 @@ upd_plane(struct plnstr *pp, int etus, struct bp *bp, int build)
            budget->bm[BUDG_PLN_MAINT].money -= cost;
            budget->money -= cost;
        }
-       /* flight pay is 5x the pay received by other military */
-       cost = etus * pcp->pl_mat[I_MILIT] * -money_mil * 5;
-       budget->bm[BUDG_PLN_MAINT].money -= cost;
-       budget->money -= cost;
+
+       if (pln_is_in_orbit(pp) && !(pp->pln_flags & PLN_SYNCHRONOUS)) {
+           if (!player->simulation)
+               move_sat(pp);
+       }
     }
 }
 
@@ -130,7 +142,7 @@ planerepair(struct plnstr *pp, struct natstr *np, struct bp *bp, int etus,
     int mult;
     int avail;
     int used;
-    int cost;
+    double cost;
 
     if (pp->pln_effic == 100)
        return;
@@ -196,7 +208,7 @@ planerepair(struct plnstr *pp, struct natstr *np, struct bp *bp, int etus,
     }
 
     bp_set_from_sect(bp, sp);
-    cost = roundavg(mult * build * pcp->pl_cost / 100.0);
+    cost = mult * pcp->pl_cost * build / 100.0;
     budget->bm[BUDG_PLN_BUILD].count += !!build;
     budget->bm[BUDG_PLN_BUILD].money -= cost;
     budget->money -= cost;