Don't let automatic supply starve the sector containing the sink

[empserver] / src / lib / subs / supply.c

diff --git a/src/lib/subs/supply.c b/src/lib/subs/supply.c
index 5e55b5e38da67cca7f80bcb9ea12f4e0f9078a39..dbe725720dc79da39c686a451141b3fa26b69eb5 100644 (file)
--- a/src/lib/subs/supply.c
+++ b/src/lib/subs/supply.c
@@ -133,7 +133,7 @@ s_commod(int own, int x, int y, i_type type, int total_wanted,
     struct shpstr ship;
     struct lndstr land;
     /* leave at least 1 military in sectors/ships */
-    int minimum = (type == I_MILIT ? 1 : 0);
+    int minimum = 0;
     int can_move;
     double move_cost, weight, mobcost;
     int packing;
@@ -145,6 +145,9 @@ s_commod(int own, int x, int y, i_type type, int total_wanted,
     getsect(x, y, &dest);
     getsect(x, y, &sect);
     if (sect.sct_own == own) {
+       if (!opt_NOFOOD && type == I_FOOD)
+           minimum = 1 + (int)ceil(food_needed(sect.sct_item,
+                                               etu_per_update));
        if (sect.sct_item[type] - wanted >= minimum) {
            sect.sct_item[type] -= wanted;
            if (actually_doit)
@@ -202,7 +205,7 @@ s_commod(int own, int x, int y, i_type type, int total_wanted,
            sect.sct_item[type] -= wanted;
 
            /* take off mobility for delivering sect */
-           n = roundavg(total_wanted * weight * move_cost);
+           n = roundavg(wanted * weight * move_cost);
            if (n < 0)
                n = 0;
            if (n > sect.sct_mobil)