From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 15 Jul 2007 09:59:52 +0000 (+0000)
Subject: (s_p_etu): econfig key no longer used, remove.
X-Git-Tag: v4.3.10~163
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=ab55ea73813008d5d65535625199c6fe1e59d4e0

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

diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index 328831a9f..f8a246e4f 100644
--- 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")
-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,
diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c
index f33c89ee5..81846e049 100644
--- 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("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);
diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c
index ba3c1db20..381b60c9f 100644
--- 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 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;
diff --git a/src/server/update.c b/src/server/update.c
index dce66cfc4..863642dbc 100644
--- a/src/server/update.c
+++ b/src/server/update.c
@@ -69,12 +69,6 @@ update_init(void)
     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);