Update copyright notice.

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

diff --git a/src/lib/update/material.c b/src/lib/update/material.c
index 593e60aa48051631dd059b81c6904a629313dc36..ab0155cb25cef5337bab36a76f00c952e9eb81be 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-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -31,65 +31,36 @@
  *     Ville Virrankoski, 1996
  */
 
-#include "misc.h"
-#include "var.h"
-#include "sect.h"
-#include "file.h"
-#include "optlist.h"
+#include <config.h>
+
 #include "budg.h"
 #include "player.h"
 #include "update.h"
-#include "common.h"
-#include "subs.h"
-
-#ifndef MIN
-#define MIN(x,y)        ((x) > (y) ? (y) : (x))
-#endif
 
 void
 get_materials(struct sctstr *sp, int *bp, int *mvec, int check)
               /* only check if found=0, remove them=1 */
 {
-    struct sctstr *usp;
-    int i;
-    int used_already;
+    i_type i;
     int still_left;
-    int svec[I_MAX + 1];
 
-    getvec(VT_ITEM, svec, (s_char *)sp, EF_SECTOR);
-    for (i = 1; i <= I_MAX; i++) {
+    for (i = I_NONE + 1; i <= I_MAX; i++) {
        if (mvec[i] == 0)
            continue;
 
-       usp = sp;
        if (check) {
            still_left = gt_bg_nmbr(bp, sp, i);
            if ((still_left - mvec[i]) < 0)
                still_left = 0;
            else
                still_left -= mvec[i];
-
-           if (opt_GRAB_THINGS)
-               mvec[i] =
-                   supply_commod(usp->sct_own, usp->sct_x, usp->sct_y, i,
-                                 mvec[i]);
            pt_bg_nmbr(bp, sp, i, still_left);
-           svec[i] = still_left;
            if (!player->simulation)
-               putvec(VT_ITEM, svec, (s_char *)sp, EF_SECTOR);
+               sp->sct_item[i] = still_left;
 
        } else {
-
-           if (opt_GRAB_THINGS) {
-               used_already = svec[i] - gt_bg_nmbr(bp, sp, i);
-               mvec[i] =
-                   try_supply_commod(usp->sct_own, usp->sct_x, usp->sct_y,
-                                     i, (mvec[i] + used_already));
-               mvec[i] -= used_already;
-           } else {            /* ! GRAB_THINGS */
-               still_left = gt_bg_nmbr(bp, sp, i);
-               mvec[i] = MIN(mvec[i], still_left);
-           }
+           still_left = gt_bg_nmbr(bp, sp, i);
+           mvec[i] = MIN(mvec[i], still_left);
        }
     }
 }