Update copyright notice

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

diff --git a/src/lib/update/deliver.c b/src/lib/update/deliver.c
index 400bbf0dcbf9be4ebd942b5886f8a9687c379618..66292375a40bf864367beaa70fe3f965f970fea8 100644 (file)
--- a/src/lib/update/deliver.c
+++ b/src/lib/update/deliver.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,47 +14,41 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  deliver.c: Deliver commodities to neighboring sector
- * 
+ *
  *  Known contributors to this file:
- *  
+ *
  */
 
-#include "misc.h"
-#include "var.h"
-#include "sect.h"
+#include <config.h>
+
 #include "item.h"
 #include "path.h"
-#include "file.h"
-#include "xy.h"
+#include "plague.h"
 #include "update.h"
-#include "subs.h"
-#include "common.h"
 
 #define DELIVER_BONUS 4.0
 
 static int
-deliver(register struct sctstr *from, struct ichrstr *ip, int dir,
-       int thresh, int amt_src, int plague, i_packing packing)
+deliver(struct sctstr *from, struct ichrstr *ip, int dir,
+       int thresh, int amt_src, int plague, enum i_packing packing)
 {
-    register struct sctstr *to;
-    int vtype;                 /* item vartype */
+    struct sctstr *to;
+    i_type vtype;              /* item vartype */
     int amt_moved;
     int amt_dst;
     int mobility;
-    float mcost;
-    struct dchrstr *dp;
+    double mcost;
     int n;
 
     if (dir <= 0 || dir > DIR_UL)
@@ -77,21 +71,27 @@ deliver(register struct sctstr *from, struct ichrstr *ip, int dir,
           ip->i_name, ownxy(from));
        return 0;
     }
-    dp = &dchr[from->sct_type];
-    vtype = ip->i_vtype;
+    vtype = ip->i_uid;
     mobility = from->sct_mobil / 2;
-    if (vtype == I_CIVIL && from->sct_own != from->sct_oldown) {
-       wu(0, from->sct_own,
-          "The conquered populace in %s refuses to relocate!\n",
-          ownxy(from));
-       return 0;
+    if (vtype == I_CIVIL) {
+       if (from->sct_own != from->sct_oldown) {
+           wu(0, from->sct_own,
+              "The conquered populace in %s refuses to relocate!\n",
+              ownxy(from));
+           return 0;
+       }
+       if (to->sct_own != to->sct_oldown) {
+           wu(0, from->sct_own,
+              "Citizens in %s refuse to relocate!\n", ownxy(from));
+           return 0;
+       }
     }
     /*
      * disallow delivery into prohibited sectors.
      * calculate unit movement cost; decrease amount if
      * there isn't enough mobility.
      */
-    mcost = sector_mcost(to, MOB_ROAD) * ip->i_lbs / ip->i_pkg[packing];
+    mcost = sector_mcost(to, MOB_MOVE) * ip->i_lbs / ip->i_pkg[packing];
     mcost /= DELIVER_BONUS;
 
     if (mobility < mcost * amt_moved) {
@@ -119,18 +119,18 @@ deliver(register struct sctstr *from, struct ichrstr *ip, int dir,
 void
 dodeliver(struct sctstr *sp)
 {
-    register int i;
+    i_type i;
     int thresh;
     int dir;
     int plague;
-    i_packing packing;
+    enum i_packing packing;
     int n;
 
     if (sp->sct_mobil <= 0)
        return;
     plague = sp->sct_pstage;
     packing = sp->sct_effic >= 60 ? dchr[sp->sct_type].d_pkg : IPKG;
-    for (i = 1; i <= I_MAX; i++) {
+    for (i = I_NONE + 1; i <= I_MAX; i++) {
        if (sp->sct_del[i] == 0)
            continue;
        thresh = sp->sct_del[i] & ~0x7;