Update copyright notice

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

diff --git a/src/lib/update/deliver.c b/src/lib/update/deliver.c
index 0ea7dc045f2fc3c2ca447faa130885886382eb8e..15986f323dd50131cd31099a56494718f2a7b3c3 100644 (file)
--- a/src/lib/update/deliver.c
+++ b/src/lib/update/deliver.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,36 +26,30 @@
  *  ---
  *
  *  deliver.c: Deliver commodities to neighboring sector
- * 
+ *
  *  Known contributors to this file:
- *  
+ *
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "plague.h"
-#include "sect.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(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 */
     int amt_moved;
     int amt_dst;
     int mobility;
-    float mcost;
+    double mcost;
     struct dchrstr *dp;
     int n;
 
@@ -80,7 +74,7 @@ deliver(struct sctstr *from, struct ichrstr *ip, int dir,
        return 0;
     }
     dp = &dchr[from->sct_type];
-    vtype = ip->i_vtype;
+    vtype = ip->i_uid;
     mobility = from->sct_mobil / 2;
     if (vtype == I_CIVIL) {
        if (from->sct_own != from->sct_oldown) {
@@ -100,7 +94,7 @@ deliver(struct sctstr *from, struct ichrstr *ip, int dir,
      * 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) {
@@ -132,7 +126,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)