Update copyright notice

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

diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c
index 9ef38ebbf2e1917fdf47a291186fb7e58ecc4140..81d946570f156d9ff93a607b262919aa0f403dce 100644 (file)
--- a/src/lib/update/distribute.c
+++ b/src/lib/update/distribute.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, 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/>.
  *
  *  ---
  *
@@ -30,6 +29,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2004-2011
  */
 
 #include <config.h>
@@ -41,14 +41,19 @@
 #include "prototypes.h"
 #include "update.h"
 
+#ifdef DISTRIBUTE_DEBUG
+#define DPRINTF(fmt, ...) ((void)printf(fmt , ## __VA_ARGS__))
+#else
+#define DPRINTF(fmt, ...) ((void)0)
+#endif
+
 #define EXPORT_BONUS 10.0
 #define IMPORT_BONUS 10.0
 
 int
-dodistribute(struct sctstr *sp, int imex, char *path, double dist_i_cost,
-            double dist_e_cost)
-         /* import or export? */
+dodistribute(struct sctstr *sp, int imex, double import_cost)
 {
+    double path_cost, dcc;
     struct ichrstr *ip;
     struct sctstr *dist;
     int amt;
@@ -64,22 +69,30 @@ dodistribute(struct sctstr *sp, int imex, char *path, double dist_i_cost,
     int rplague;
     int lplague;
 
-    if ((sp->sct_dist_x == sp->sct_x) && (sp->sct_dist_y == sp->sct_y))
+    if (imex == IMPORT && import_cost < 0.0)
        return 0;
 
-    if (!path) {
-       if (sp->sct_own != 0) {
-           if (imex == EXPORT) /* only want this once */
+    dist = getsectp(sp->sct_dist_x, sp->sct_dist_y);
+    if (imex == IMPORT)
+       path_cost = import_cost;
+    else {
+       dcc = sector_mcost(dist, MOB_MOVE);
+       if (import_cost < 0.0 || dcc < 0.0) {
+           if (sp->sct_own && sp->sct_uid != dist->sct_uid)
                wu(0, sp->sct_own, "No path to dist sector for %s\n",
                   ownxy(sp));
+           return 0;
        }
-       return 0;
+       path_cost = import_cost - sector_mcost(sp, MOB_MOVE) + dcc;
     }
 
-    dist = getsectp(sp->sct_dist_x, sp->sct_dist_y);
     dist_packing = dist->sct_effic >= 60 ? dchr[dist->sct_type].d_pkg : IPKG;
     sect_packing = sp->sct_effic   >= 60 ? dchr[sp->sct_type].d_pkg : IPKG;
 
+    DPRINTF("distribute: %d,%d to %d,%d pathcost %g\n",
+           sp->sct_x, sp->sct_y, sp->sct_dist_x, sp->sct_dist_y,
+           path_cost);
+
     lplague = rplague = changed = 0;
     for (item = I_NONE + 1; item <= I_MAX; item++) {
        if (sp->sct_dist[item] == 0)
@@ -129,7 +142,7 @@ dodistribute(struct sctstr *sp, int imex, char *path, double dist_i_cost,
                    continue;
            }
            pack = ip->i_pkg[dist_packing];
-           mcost = dist_i_cost / pack * ip->i_lbs / IMPORT_BONUS;
+           mcost = path_cost / pack * ip->i_lbs / IMPORT_BONUS;
            if (dist->sct_mobil < mcost * amt)
                amt = dist->sct_mobil / mcost;
 
@@ -160,7 +173,7 @@ dodistribute(struct sctstr *sp, int imex, char *path, double dist_i_cost,
            if (amt > amt_sect)
                amt = amt_sect;
            pack = MAX(ip->i_pkg[sect_packing], ip->i_pkg[dist_packing]);
-           mcost = dist_e_cost / pack * ip->i_lbs / EXPORT_BONUS;
+           mcost = path_cost / pack * ip->i_lbs / EXPORT_BONUS;
            if (sp->sct_mobil < mcost * amt)
                amt = sp->sct_mobil / mcost;
            if (amt > ITEM_MAX - amt_dist)