(MIN_MOBCOST, LND_MINMOBCOST): Just one use, inline and remove.

diff --git a/include/land.h b/include/land.h
index e3648f0c9aec73469ef6df397730077745146cb0..6bbcd809dbec2c3b01e172069ac5a49278b7d388 100644 (file)
--- a/include/land.h
+++ b/include/land.h
@@ -45,7 +45,6 @@
 #define N_MAXLAND      30
 #define LAND_MINEFF    10
 #define LAND_MINFIREEFF 40     /* arty must be this effic to fire */
-#define LND_MINMOBCOST  0.200
 
 struct lndstr {
     /* initial part must match struct genitem */

diff --git a/include/sect.h b/include/sect.h
index d2598c5c206e97332618697e16c1b93f1e3d77e5..8de63584ef4f2039a6fafd567e523bde755cd43a 100644 (file)
--- a/include/sect.h
+++ b/include/sect.h
@@ -175,7 +175,6 @@ extern struct dchrstr bigcity_dchr;
 #define SCT_DEFENSE(sp) \
     (opt_DEFENSE_INFRA ? (sp)->sct_defense : (sp)->sct_effic)
 
-#define MIN_MOBCOST  0.001     /* lowest cost a sector can have to move into */
 #define FORTEFF 5              /* forts must be 5% efficient to fire. */
 
 #define MOB_MOVE    0

diff --git a/src/lib/common/move.c b/src/lib/common/move.c
index 931a909da4aa16c55760cad9cb39fbc637d0cc0f..60c8c291b81d14e410cad86a620bcc79802fe11a 100644 (file)
--- a/src/lib/common/move.c
+++ b/src/lib/common/move.c
@@ -66,10 +66,10 @@ sector_mcost(struct sctstr *sp, int mobtype)
        d = (d * 10.0 - sp->sct_effic) / 115;
 
     if (mobtype == MOB_MOVE)
-       return MAX(d, MIN_MOBCOST);
+       return MAX(d, 0.001);
     if (sp->sct_own != sp->sct_oldown && sp->sct_mobil <= 0
        && mobtype != MOB_RAIL)
-       return MAX(d, LND_MINMOBCOST);
+       return MAX(d, 0.2);
     return MAX(d, 0.01);
 }