Update copyright notice

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

diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c
index 16210437324cc96da8b29fbdd54b074a2c140308..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,6 +64,27 @@ prod_plane(int etus, int natnum, struct bp *bp, int buildem)
            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);
     }
 }
@@ -105,10 +122,6 @@ 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)