Remove econfig key mission_mob_cost

Questionable feature, and hasn't been used in a long time.

diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index e52ecc11a5f84c1824ad81172c858e9ec7c175a6..447140a9fc6e1f7f3e782d73f878ed309ef4e276 100644 (file)
--- a/include/econfig-spec.h
+++ b/include/econfig-spec.h
@@ -316,8 +316,6 @@ EMPCFBOTH("fire_range_factor", fire_range_factor, float, NSC_FLOAT, 0,
 EMPCFBOTH("sect_mob_neg_factor", sect_mob_neg_factor, int, NSC_INT, 0,
     "Initial mobility for MOB_ACCESS (-etu_per_update / sect_mob_neg_factor)")
 EMPCF_COMMENT("# Applies to sector takeover, ship build, plane or land unit build, and trade.")
-EMPCFBOTH("mission_mob_cost", mission_mob_cost, double, NSC_DOUBLE, 0,
-    "Cost to put something on a mission (percentage of max mob)")
 
 EMPCF_COMMENT("\n\n### Populace")
 EMPCFBOTH("uwbrate", uwbrate, double, NSC_DOUBLE, 0,

diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c
index 08d03bdb7af9b51b6f63951d13572ccbe610f4d4..ab403878bbac942b69bd39789349cee71f16e04b 100644 (file)
--- a/src/lib/commands/miss.c
+++ b/src/lib/commands/miss.c
@@ -57,7 +57,7 @@ mission(void)
     int radius, range;
     union empobj_storage item;
     struct empobj *gp;
-    int num = 0, mobmax, mobused;
+    int num = 0;
     struct nstr_item ni;
     char buf[1024];
 
@@ -166,22 +166,12 @@ mission(void)
     } else
        radius = 9999;
 
-    if ((mobmax = get_empobj_mob_max(type)) == -1)
-       return RET_FAIL;
-
-    mobused = ldround(mission_mob_cost * (double)mobmax, 1);
-
     while (nxtitem(&ni, &item)) {
        gp = (struct empobj *)&item;
 
        if (!player->owner || gp->own == 0)
            continue;
 
-       if (gp->mobil < mobused && mission_mob_cost) {
-           pr("%s: not enough mobility! (needs %d)\n",
-              obj_nameof(gp), mobused);
-           continue;
-       }
        if (mission == MI_RESERVE && !lnd_can_attack((struct lndstr *)gp)) {
            pr("%s is not designed to fight ground troops\n",
               obj_nameof(gp));
@@ -254,7 +244,6 @@ mission(void)
            y = gp->y;
        }
 
-       gp->mobil -= mobused;
        gp->mission = mission;
        range = oprange(gp);
        if (range < mapdist(gp->x, gp->y, x, y)) {

diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c
index 6e618c020a4a1adad3cd89bcf1d25f1f69fc202f..506969becb02a7b21cb32d402ba4898d963db269 100644 (file)
--- a/src/lib/commands/vers.c
+++ b/src/lib/commands/vers.c
@@ -139,10 +139,6 @@ vers(void)
        (int)(ship_mob_scale * (float)etu_per_update),
        (int)(plane_mob_scale * (float)etu_per_update),
        (int)(land_mob_scale * (float)etu_per_update));
-    pr("Mission mobility cost\t\t--\t%d\t%d\t%d\n",
-       ldround((mission_mob_cost * (double)ship_mob_max), 1),
-       ldround((mission_mob_cost * (double)plane_mob_max), 1),
-       ldround((mission_mob_cost * (double)land_mob_max), 1));
     pr("Max eff gain per update\t\t--\t%d\t%d\t%d\n",
        MIN((int)(ship_grow_scale * (float)etu_per_update), 100),
        MIN((int)(plane_grow_scale * (float)etu_per_update), 100),

diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c
index 2611679f509bc9114562013f1a05f39598f352da..1b54ab4444b57f2494ffc42206bb509389127942 100644 (file)
--- a/src/lib/global/constants.c
+++ b/src/lib/global/constants.c
@@ -95,8 +95,6 @@ int fort_max_interdiction_range = 8;
 int ship_max_interdiction_range = 8;
 int land_max_interdiction_range = 8;
 
-double mission_mob_cost = 0.0; /* Cost is percentage of max mob */
-
 double unit_damage = 0.30;     /* Units take this fraction of normal damage */
 double people_damage = 1.00;   /* Civs/mil/uw take this fraction of damage */
 double collateral_dam = 0.10;  /* Side effect damage to sector */