Update copyright notice

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

diff --git a/src/lib/update/material.c b/src/lib/update/material.c
index f44879962d4d2e1dde251d5bc75eaf46ada2102d..7bf5968a187240b002718c2b06f7ba32aa64d03b 100644 (file)
--- a/src/lib/update/material.c
+++ b/src/lib/update/material.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2013, 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
@@ -28,34 +28,32 @@
  *
  *  Known contributors to this file:
  *     Ville Virrankoski, 1996
- *     Markus Armbruster, 2007
+ *     Markus Armbruster, 2007-2016
  */
 
 #include <config.h>
 
-#include "budg.h"
 #include "chance.h"
-#include "player.h"
+#include "sect.h"
 #include "update.h"
 
 /*
- * Get build materials from sector SP.
- * BP is the sector's build pointer.
- * MVEC[] defines the materials needed to build 100%.
- * PCT is the percentage to build.
+ * Get build materials from sector @sp.
+ * Array @mvec[ITEM_MAX+1] defines the materials needed to build 100%.
+ * @pct is the percentage to build.
  * Adjust build percentage downwards so that available materials
  * suffice.  Remove the materials.
  * Return adjusted build percentage.
  */
 int
-get_materials(struct sctstr *sp, struct bp *bp, int *mvec, int pct)
+get_materials(struct sctstr *sp, short mvec[], int pct)
 {
     int i, amt;
 
     for (i = I_NONE + 1; i <= I_MAX; i++) {
        if (mvec[i] == 0)
            continue;
-       amt = bp_get_item(bp, sp, i);
+       amt = sp->sct_item[i];
        if (amt * 100 < mvec[i] * pct)
            pct = amt * 100 / mvec[i];
     }
@@ -63,13 +61,11 @@ get_materials(struct sctstr *sp, struct bp *bp, int *mvec, int pct)
     for (i = I_NONE + 1; i <= I_MAX; i++) {
        if (mvec[i] == 0)
            continue;
-       amt = bp_get_item(bp, sp, i);
+       amt = sp->sct_item[i];
        amt -= roundavg(mvec[i] * pct / 100.0);
        if (CANT_HAPPEN(amt < 0))
            amt = 0;
-       bp_put_item(bp, sp, i, amt);
-       if (!player->simulation)
-           sp->sct_item[i] = amt;
+       sp->sct_item[i] = amt;
     }
 
     return pct;