Units no longer die from lack of maintenance

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

diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index 7d9e50a69e12e2f6d745bb396bbc1f6c459bab84..ec206873af5883185ae251a1082078e7b13766e1 100644 (file)
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.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-2011, 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/>.
  *
  *  ---
  *
@@ -31,7 +30,7 @@
  *     Dave Pare, 1986
  *     Steve McClure, 1996
  *     Ron Koenderink, 2004
- *     Markus Armbruster, 2006-2008
+ *     Markus Armbruster, 2006-2011
  */
 
 #include <config.h>
@@ -59,9 +58,7 @@ prod_ship(int etus, int natnum, struct bp *bp, int build)
     struct natstr *np;
     int n, k = 0;
     int start_money;
-    int lastx = 9999, lasty = 9999;
 
-    bp_enable_cachepath();
     for (n = 0; NULL != (sp = getshipp(n)); n++) {
        if (sp->shp_own == 0)
            continue;
@@ -75,16 +72,6 @@ prod_ship(int etus, int natnum, struct bp *bp, int build)
        }
 
        np = getnatp(sp->shp_own);
-       if (lastx == 9999 || lasty == 9999) {
-           lastx = sp->shp_x;
-           lasty = sp->shp_y;
-       }
-       if (lastx != sp->shp_x || lasty != sp->shp_y) {
-           /* Reset the cache */
-           bp_disable_cachepath();
-           bp_clear_cachepath();
-           bp_enable_cachepath();
-       }
        start_money = np->nat_money;
        upd_ship(sp, etus, np, bp, build);
        if (build && !player->simulation)       /* make sure to only autonav once */
@@ -95,8 +82,6 @@ prod_ship(int etus, int natnum, struct bp *bp, int build)
        if (player->simulation)
            np->nat_money = start_money;
     }
-    bp_disable_cachepath();
-    bp_clear_cachepath();
 
     if (opt_SAIL) {
        if (build && !player->simulation)       /* make sure to only sail once */
@@ -119,10 +104,7 @@ upd_ship(struct shpstr *sp, int etus,
     struct pchrstr *product;
     unsigned char *resource;
     int dep;
-    int n;
-    int mult;
-    int cost;
-    int eff;
+    int n, mult, cost, eff_lost;
 
     mp = &mchr[(int)sp->shp_type];
     if (build == 1) {
@@ -136,18 +118,14 @@ upd_ship(struct shpstr *sp, int etus,
            mult = 2;
        cost = -(mult * etus * MIN(0.0, money_ship * mp->m_cost));
        if (np->nat_money < cost && !player->simulation) {
-           if ((eff = sp->shp_effic - etus / 5) < SHIP_MINEFF) {
-               wu(0, sp->shp_own,
-                  "%s lost to lack of maintenance\n", prship(sp));
-               makelost(EF_SHIP, sp->shp_own, sp->shp_uid,
-                        sp->shp_x, sp->shp_y);
-               sp->shp_own = 0;
-               return;
+           eff_lost = etus / 5;
+           if (sp->shp_effic - eff_lost < SHIP_MINEFF)
+               eff_lost = sp->shp_effic - SHIP_MINEFF;
+           if (eff_lost > 0) {
+               wu(0, sp->shp_own, "%s lost %d%% to lack of maintenance\n",
+                  prship(sp), eff_lost);
+               sp->shp_effic -= eff_lost;
            }
-           wu(0, sp->shp_own,
-              "%s lost %d%% to lack of maintenance\n",
-              prship(sp), sp->shp_effic - eff);
-           sp->shp_effic = eff;
        } else {
            np->nat_money -= cost;
        }
@@ -161,7 +139,7 @@ upd_ship(struct shpstr *sp, int etus,
                product = &pchr[dchr[SCT_OIL].d_prd];
                oil_gained = roundavg(total_work(100, etus,
                                                 sp->shp_item[I_CIVIL],
-                                                sp->shp_item[I_MILIT],
+                                                sp->shp_item[I_MILIT],
                                                 sp->shp_item[I_UW],
                                                 ITEM_MAX)
                                      * sp->shp_effic / 100.0
@@ -277,19 +255,14 @@ shiprepair(struct shpstr *ship, struct natstr *np, struct bp *bp, int etus)
     int w_p_eff;
     int mult;
     int mvec[I_MAX + 1];
-    int rel;
 
     mp = &mchr[(int)ship->shp_type];
     sp = getsectp(ship->shp_x, ship->shp_y);
 
-    if ((sp->sct_own != ship->shp_own) && (sp->sct_own != 0)) {
-       rel = getrel(getnatp(sp->sct_own), ship->shp_own);
-
-       if (rel < FRIENDLY)
-           return;
-    }
+    if (sp->sct_own != 0
+       && relations_with(sp->sct_own, ship->shp_own) < FRIENDLY)
+       return;
 
-    wf = 0;
     /* only military can work on a military boat */
     if (mp->m_glim != 0)
        wf = etus * ship->shp_item[I_MILIT] / 2;
@@ -382,10 +355,6 @@ feed_ship(struct shpstr *sp, int etus)
     needed = (int)ceil(food_needed(sp->shp_item, etus));
 
     /* scrounge */
-    if (needed > sp->shp_item[I_FOOD])
-       sp->shp_item[I_FOOD] += supply_commod(sp->shp_own,
-                                       sp->shp_x, sp->shp_y, I_FOOD,
-                                       needed - sp->shp_item[I_FOOD]);
     if (needed > sp->shp_item[I_FOOD]) {
        /* take from embarked land units, but don't starve them */
        snxtitem_cargo(&ni, EF_LAND, EF_SHIP, sp->shp_uid);