Update copyright notice

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

diff --git a/src/lib/update/deliver.c b/src/lib/update/deliver.c
index 4a99b1474079d6631c747870ed92c05e48e1a9f7..c9e95ff8533016eb6793d5f75138904960478495 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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2018, 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,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,37 +25,33 @@
  *  ---
  *
  *  deliver.c: Deliver commodities to neighboring sector
- * 
+ *
  *  Known contributors to this file:
- *  
+ *     Markus Armbruster, 2004-2016
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "plague.h"
-#include "sect.h"
 #include "item.h"
+#include "optlist.h"
 #include "path.h"
-#include "file.h"
-#include "xy.h"
+#include "plague.h"
+#include "sect.h"
+#include "prototypes.h"
 #include "update.h"
-#include "subs.h"
-#include "common.h"
 
 #define DELIVER_BONUS 4.0
 
 static int
 deliver(struct sctstr *from, struct ichrstr *ip, int dir,
-       int thresh, int amt_src, int plague, i_packing packing)
+       int thresh, int amt_src, int plague, enum i_packing packing)
 {
     struct sctstr *to;
-    i_type vtype;                      /* item vartype */
+    i_type vtype;              /* item vartype */
     int amt_moved;
     int amt_dst;
     int mobility;
     double mcost;
-    struct dchrstr *dp;
     int n;
 
     if (dir <= 0 || dir > DIR_UL)
@@ -66,7 +61,7 @@ deliver(struct sctstr *from, struct ichrstr *ip, int dir,
     if ((amt_moved = amt_src - thresh) <= 0)
        return 0;
     /*
-     * make sure delivery looks ok.  Check where its going,
+     * make sure delivery looks OK.  Check where its going,
      * where its coming from, and see if there is more than
      * the threshold amount
      */
@@ -79,7 +74,6 @@ deliver(struct sctstr *from, struct ichrstr *ip, int dir,
           ip->i_name, ownxy(from));
        return 0;
     }
-    dp = &dchr[from->sct_type];
     vtype = ip->i_uid;
     mobility = from->sct_mobil / 2;
     if (vtype == I_CIVIL) {
@@ -95,6 +89,9 @@ deliver(struct sctstr *from, struct ichrstr *ip, int dir,
            return 0;
        }
     }
+    /* make sure not to abandon the sector */
+    if (vtype == I_CIVIL || (vtype == I_MILIT && !to->sct_item[I_CIVIL]))
+       amt_moved--;
     /*
      * disallow delivery into prohibited sectors.
      * calculate unit movement cost; decrease amount if
@@ -132,7 +129,7 @@ dodeliver(struct sctstr *sp)
     int thresh;
     int dir;
     int plague;
-    i_packing packing;
+    enum i_packing packing;
     int n;
 
     if (sp->sct_mobil <= 0)