Remove dodistribute() parameter path

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

diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c
index 98ce93e99e2d957af198a9aa100fc20eb79c2de5..7f86179e71d319bce58e146e7c7563b1dbcccba9 100644 (file)
--- a/src/lib/update/distribute.c
+++ b/src/lib/update/distribute.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,45 +19,40 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  distribute.c: Do distribution to sectors
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 1998
  */
 
-#include <stdlib.h>
-#include "misc.h"
-#include "plague.h"
-#include "nat.h"
-#include "sect.h"
+#include <config.h>
+
+#include "distribute.h"
 #include "item.h"
-#include "xy.h"
 #include "path.h"
-#include "file.h"
-#include "distribute.h"
-#include "update.h"
-#include "subs.h"
-#include "common.h"
+#include "plague.h"
 #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
 
-#ifndef MAX
-#define MAX(x,y) ((x) < (y) ? (y) : (x))
-#endif
-
 int
-dodistribute(struct sctstr *sp, int imex, s_char *path, double dist_i_cost,
-            double dist_e_cost)
-         /* import or export? */
+dodistribute(struct sctstr *sp, int imex,
+            double dist_i_cost, double dist_e_cost)
 {
     struct ichrstr *ip;
     struct sctstr *dist;
@@ -65,7 +60,7 @@ dodistribute(struct sctstr *sp, int imex, s_char *path, double dist_i_cost,
     int thresh;
     int amt_dist;
     int amt_sect;
-    i_packing sect_packing, dist_packing;
+    enum i_packing sect_packing, dist_packing;
     int pack;
     double mcost;
     int diff;
@@ -77,7 +72,7 @@ dodistribute(struct sctstr *sp, int imex, s_char *path, double dist_i_cost,
     if ((sp->sct_dist_x == sp->sct_x) && (sp->sct_dist_y == sp->sct_y))
        return 0;
 
-    if (path == (s_char *)0) {
+    if (dist_e_cost < 0.0) {
        if (sp->sct_own != 0) {
            if (imex == EXPORT) /* only want this once */
                wu(0, sp->sct_own, "No path to dist sector for %s\n",
@@ -90,6 +85,10 @@ dodistribute(struct sctstr *sp, int imex, s_char *path, double dist_i_cost,
     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,
+           imex == IMPORT ? dist_i_cost : dist_e_cost);
+
     lplague = rplague = changed = 0;
     for (item = I_NONE + 1; item <= I_MAX; item++) {
        if (sp->sct_dist[item] == 0)
@@ -125,13 +124,13 @@ dodistribute(struct sctstr *sp, int imex, s_char *path, double dist_i_cost,
             * check to make sure have enough mobility in the
             * dist sector to import what we need.
             */
-           if (dist->sct_mobil <= 0) {
-               /*logerror("  dist mobil < 0"); */
+           if (dist->sct_mobil <= 0)
                continue;
-           }
            amt = diff;
-           if (item == I_CIVIL)
-               amt_dist--;     /* Don't send your last civ */
+           /* make sure not to abandon the sector */
+           if (item == I_CIVIL ||
+               (item == I_MILIT && dist->sct_item[I_CIVIL] == 0))
+               amt_dist--;
 
            if (amt_dist < amt) {
                amt = amt_dist;
@@ -164,10 +163,8 @@ dodistribute(struct sctstr *sp, int imex, s_char *path, double dist_i_cost,
             * also make sure that there's enough space in the
             * target sector to hold the required amt.
             */
-           if (sp->sct_mobil <= 0) {
-               /*logerror("  sp mob is zero"); */
+           if (sp->sct_mobil <= 0)
                continue;
-           }
            amt = diff;
            if (amt > amt_sect)
                amt = amt_sect;