(opt_SHIP_DECAY, Options, shiprepair): Remove option SHIP_DECAY.

diff --git a/include/options.h b/include/options.h
index 7b24a16691ef24d7088be5c0123b8d6f5402cc16..26e84ec41610d338f470e860daffa2a4ab1f8b1d 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -62,7 +62,6 @@
 /*#define START_UNITS  2 *//* How many free start units you get. Types are
    specified in src/lib/global/constants.c */
 
-/* #define SHIP_DECAY *//* Allows ships at sea to decay */
 #define PLANENAMES             /* Use real names for planes, not the boring ones :) */
 
 /* #define GO_RENEW *//* Gold and Oil are renewable resources */

diff --git a/include/optlist.h b/include/optlist.h
index f8fddcc7e418f032a7ff2153d01eff890e460ba6..6dde076f172b90229fdb7ce250aa0c5c3f674dc4 100644 (file)
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -79,7 +79,6 @@ extern int opt_RES_POP;
 extern int opt_ROLLOVER_AVAIL;
 extern int opt_SAIL;
 extern int opt_SHIPNAMES;
-extern int opt_SHIP_DECAY;
 extern int opt_SHOWPLANE;
 extern int opt_SLOW_WAR;
 extern int opt_SNEAK_ATTACK;

diff --git a/info/Server/Options.t b/info/Server/Options.t
index 1706fe26bf7abe210596d5c667ddc7017c68a9f2..9348765bdc3600c3aec96291891ec3309fe829d0 100644 (file)
--- a/info/Server/Options.t
+++ b/info/Server/Options.t
@@ -57,7 +57,6 @@ NO_FORT_FIRE:   Forts cannot fire.
 NO_LCMS:        The game doesn't need lcms to be played.
 NO_HCMS:        The game doesn't need hcms to be played.
 NO_OIL:         The game doesn't need oil to be played.
-SHIP_DECAY:     Allows ships to decay when at sea with not enough crew.
 TECH_POP:       Technology costs more to make as your civilian population
                  grows past 50,000 civilians.
 TREATIES:       Sign treaties with your friends and enemies, and breaking of

diff --git a/src/lib/global/options.c b/src/lib/global/options.c
index e9ba0b442721ee94dd3f552c4778c76e5f357b37..d8dba9f5a52549ca3d82c411db51978ce4ed550c 100644 (file)
--- a/src/lib/global/options.c
+++ b/src/lib/global/options.c
@@ -75,12 +75,6 @@ int opt_DEFENSE_INFRA = 1;
 int opt_DEFENSE_INFRA = 0;
 #endif
 
-#ifdef SHIP_DECAY
-int opt_SHIP_DECAY = 1;
-#else
-int opt_SHIP_DECAY = 0;
-#endif
-
 #ifdef NO_HCMS
 int opt_NO_HCMS = 1;
 #else
@@ -345,7 +339,6 @@ struct option_list Options[] = {
     {"RES_POP", &opt_RES_POP},
     {"ROLLOVER_AVAIL", &opt_ROLLOVER_AVAIL},
     {"SAIL", &opt_SAIL},
-    {"SHIP_DECAY", &opt_SHIP_DECAY},
     {"SHIPNAMES", &opt_SHIPNAMES},
     {"SHOWPLANE", &opt_SHOWPLANE},
     {"SLOW_WAR", &opt_SLOW_WAR},

diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index 2e043bea80df0c5dcf0a06f263628ca3236599af..f8686ac86eac02260efef9d90f3e35f4b1174ce4 100644 (file)
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -301,41 +301,6 @@ shiprepair(register struct shpstr *ship, struct natstr *np,
 
     w_p_eff = 20 + (mp->m_lcm + 2 * mp->m_hcm);
 
-    if (sp->sct_type != SCT_HARBR) {
-       int abs_max, amt;
-
-       if (ship->shp_glim > 0) {
-           abs_max = vl_find(V_MILIT, mp->m_vtype,
-                             mp->m_vamt, (int)mp->m_nv);
-           amt = ship->shp_item[I_MILIT];
-       } else {
-           abs_max = vl_find(V_CIVIL, mp->m_vtype,
-                             mp->m_vamt, (int)mp->m_nv);
-           amt = ship->shp_item[I_CIVIL];
-           if (abs_max == 0) {
-               abs_max = vl_find(V_MILIT, mp->m_vtype, mp->m_vamt,
-                                 (int)mp->m_nv);
-               amt = ship->shp_item[I_MILIT];
-           }
-       }
-
-       if (abs_max == 0) {
-           logerror("Abs max of 0 for ship %d\n", ship->shp_uid);
-           abs_max = 1;
-       }
-       avail -= (etus * (100 - ((amt * 100) / abs_max))) / 7;
-       /* think of it as entropy in action */
-    }
-
-    if (avail <= 0) {
-       if (!player->simulation) {
-           if (opt_SHIP_DECAY) {
-               ship->shp_effic += avail / w_p_eff;
-           }
-           return 1;
-       }
-    }
-
     if ((sp->sct_off) && (sp->sct_own == ship->shp_own))
        return 1;