(s_p_etu): econfig key no longer used, remove.

diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index 328831a9f124bf41f86a6d95c6ef0ecbf683cc22..f8a246e4f668cf5f8f81fec44ae4e798a99744a9 100644 (file)
--- a/include/econfig-spec.h
+++ b/include/econfig-spec.h
@@ -106,11 +106,6 @@ EMPCF_COMMENT("\n\n### Update policy\n\n"
     "# same directory as this file.")
 EMPCFBOTH("etu_per_update", etu_per_update, int, NSC_INT, 0,
     "Number of ETUs per update")
     "# same directory as this file.")
 EMPCFBOTH("etu_per_update", etu_per_update, int, NSC_INT, 0,
     "Number of ETUs per update")

-EMPCFBOTH("s_p_etu", s_p_etu, int, NSC_INT, 0,
-    "Seconds per ETU")
-EMPCF_COMMENT("# FIXME get rid of this!\n"
-    "# Until then, set it so that s_p_etu * etu_per_update seconds equals\n"
-    "# the time between scheduled updates.")

 EMPCFBOTH("update_window", update_window, int, NSC_INT, 0,
     "Time window the update will occur in after the update time, in seconds")
 EMPCFBOTH("pre_update_hook", pre_update_hook, char *, NSC_STRING, KM_INTERNAL,
 EMPCFBOTH("update_window", update_window, int, NSC_INT, 0,
     "Time window the update will occur in after the update time, in seconds")
 EMPCFBOTH("pre_update_hook", pre_update_hook, char *, NSC_STRING, KM_INTERNAL,

diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c
index f33c89ee527b33e6d2932f5fc074ac7fa03c4c7a..81846e049d6a6cc1d60e26eefd2bd697c37c3036 100644 (file)
--- a/src/lib/commands/vers.c
+++ b/src/lib/commands/vers.c
@@ -61,8 +61,6 @@ vers(void)
     pr("By default, countries use %s coordinate system.\n",
        (players_at_00) ? "the deity's" : "their own");
     pr("\n");
     pr("By default, countries use %s coordinate system.\n",
        (players_at_00) ? "the deity's" : "their own");
     pr("\n");

-    pr("An Empire time unit is %d second%s long.\n",
-       s_p_etu, s_p_etu != 1 ? "s" : "");

     pr("Use the 'update' command to find out the time of the next update.\n");
     pr("The current time is %19.19s.\n", ctime(&now));
     pr("An update consists of %d empire time units.\n", etu_per_update);
     pr("Use the 'update' command to find out the time of the next update.\n");
     pr("The current time is %19.19s.\n", ctime(&now));
     pr("An update consists of %d empire time units.\n", etu_per_update);

diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c
index ba3c1db209a50c8907c9675fd728fc37d09123fa..381b60c9f5c9f8bc5c05946fe60f1b44744221e7 100644 (file)
--- a/src/lib/global/constants.c
+++ b/src/lib/global/constants.c
@@ -54,7 +54,6 @@ int MARK_DELAY = 7200;                /* Seconds to bid on commodities */
 int TRADE_DELAY = 7200;                /* Seconds to bid on units */
 
 int m_m_p_d = 1440;            /* max mins of play per day (per country) */
 int TRADE_DELAY = 7200;                /* Seconds to bid on units */
 
 int m_m_p_d = 1440;            /* max mins of play per day (per country) */

-int s_p_etu = 10;              /* seconds per Empire Time Unit */

 int etu_per_update = 60;       /* # of etu's per update */
 int update_window = 0;         /* update window adjustment, in seconds */
 int update_demand = UPD_DEMAND_NONE;
 int etu_per_update = 60;       /* # of etu's per update */
 int update_window = 0;         /* update window adjustment, in seconds */
 int update_demand = UPD_DEMAND_NONE;

diff --git a/src/server/update.c b/src/server/update.c
index dce66cfc4e6f726b902ba0050834d25649606a0d..863642dbc02fd7fa35f4be5f910241bfc2695fa4 100644 (file)
--- a/src/server/update.c
+++ b/src/server/update.c
@@ -69,12 +69,6 @@ update_init(void)
     struct player *dp;
     int stacksize;
 
     struct player *dp;
     int stacksize;
 

-    if (s_p_etu <= 0) {
-       logerror("bad value for s_p_etu (%d)", s_p_etu);
-       s_p_etu = 2 * 60;
-       logerror("setting s_p_etu to %d", s_p_etu);
-    }
-

     update_schedule_anchor = (time(NULL) + 59) / 60 * 60;
     if (update_get_schedule() < 0)
        exit(1);
     update_schedule_anchor = (time(NULL) + 59) / 60 * 60;
     if (update_get_schedule() < 0)
        exit(1);