Remove option TREATIES

[empserver] / include / econfig-spec.h

diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index 5113bfc67ba47dbcafcdf3a4893d4df100104e03..94f8d91532fe9e84c08efa0e4043aec67f2b67ce 100644 (file)
--- a/include/econfig-spec.h
+++ b/include/econfig-spec.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Marc Olzheim, 2004
- *     Markus Armbruster, 2004-2011
+ *     Markus Armbruster, 2004-2014
  */
 
 /*
@@ -84,11 +84,21 @@ EMPCF_COMMENT("# Set this to your source tree's src/lib/global to run the server
              "# without installing it, else leave it alone.")
 EMPCFBOTH("listen_addr", listen_addr, char *, NSC_STRING, KM_INTERNAL,
     "Local IP address the server should listen on")
-EMPCF_COMMENT("# \"\" listens on all, localhost just on the loopback interface.")
+EMPCF_COMMENT("# \"\" listens on all, localhost just on the loopback interface.\n"
+    "# OpenBSD restriction: when the system has both IPv4 and IPv6\n"
+    "# addresses configured, \"\" listens on all IPv4 addresses, and \"::\"\n"
+    "# on all IPv6 addresses.  There is no way to listen both on all IPv4\n"
+    "# and on all IPv6 interfaces.\n"
+    "# Systems using GNU libc such as Linux are frequently configured in a\n"
+    "# way that makes listen_addr "" listen only on all IPv4 addresses.\n"
+    "# You need to use \"::\" to listen on all IPv4 and IPv6 addresses.")
 EMPCFBOTH("port", loginport, char *, NSC_STRING, KM_INTERNAL,
     "TCP port the server will bind")
 EMPCFBOTH("keep_journal", keep_journal, int, NSC_INT, KM_INTERNAL,
     "Enable journal log file")
+EMPCF_COMMENT("# 0 - Disabled\n"
+    "# 1 - Enabled, player output suppressed\n"
+    "# 2 - Enabled, log everything (big; rotating & compressing advised)")
 EMPCFBOTH("post_crash_dump_hook", post_crash_dump_hook, char *, NSC_STRING, KM_INTERNAL,
     "Shell command run right after a crash dump, in the game's data directory")
 EMPCFBOTH("privname", privname, char *, NSC_STRING, 0,
@@ -145,7 +155,6 @@ EMPCF_OPT("BRIDGETOWERS", opt_BRIDGETOWERS,
 EMPCF_COMMENT("# If you enable this, make sure that bridge spans can produce\n"
     "# sufficient avail.  Depending on your etu_per_update, you may have\n"
     "# to tweak buil_tower_bh, rollover_avail_max, or bridge span's maxpop.")
-// FIXME doc avail
 EMPCF_OPT("EASY_BRIDGES", opt_EASY_BRIDGES,
     "Allow bridge building without bridge heads")
 EMPCF_OPT("FALLOUT", opt_FALLOUT,
@@ -160,8 +169,6 @@ EMPCF_OPT("HIDDEN", opt_HIDDEN,
     "Hide information between players")
 EMPCF_OPT("INTERDICT_ATT", opt_INTERDICT_ATT,
     "Interdict post-attack move in")
-EMPCF_OPT("LANDSPIES", opt_LANDSPIES,
-    "Enable the land unit type spies")
 EMPCF_OPT("LOANS", opt_LOANS,
     "Allow bailing out of other countries via S&L scandals")
 EMPCF_OPT("LOSE_CONTACT", opt_LOSE_CONTACT,
@@ -188,10 +195,6 @@ EMPCF_OPT("SUPER_BARS", opt_SUPER_BARS,
     "Make bars immune to damage")
 EMPCF_OPT("TECH_POP", opt_TECH_POP,
     "Technology costs more as population rises")
-EMPCF_OPT("TRADESHIPS", opt_TRADESHIPS,
-    "Enable Tradeships")
-EMPCF_OPT("TREATIES", opt_TREATIES,
-    "Allow treaties")
 
 EMPCF_COMMENT("\n\n### Countries")
 EMPCFBOTH("btu_build_rate", btu_build_rate, float, NSC_FLOAT, 0,
@@ -202,11 +205,15 @@ EMPCFBOTH("max_btus", max_btus, int, NSC_INT, 0,
     "Maximum number of BTUs a country can have")
 EMPCFBOTH("max_idle", max_idle, int, NSC_INT, 0,
     "Maximum number of minutes a player can sit idle while logged in")
+EMPCFBOTH("max_idle_visitor", max_idle_visitor, int, NSC_INT, 0,
+    "Maximum number of minutes a visitor can sit idle while logged in")
+EMPCFBOTH("login_grace_time", login_grace_time, int, NSC_INT, 0,
+    "Grace time for clients to complete login and logout (seconds)")
 EMPCFBOTH("players_at_00", players_at_00, int, NSC_INT, 0,
     "Players have their coordinate system at deity 0,0 (0 - no, 1 - yes)")
 EMPCFBOTH("at_least_one_100", at_least_one_100, int, NSC_INT, KM_INTERNAL,
     "Initialize new countries with at least one sector with 100 of all resource")
-EMPCFBOTH("start_cash", start_cash, long, NSC_LONG, KM_INTERNAL,
+EMPCFBOTH("start_cash", start_cash, int, NSC_INT, KM_INTERNAL,
     "Starting cash for new countries")
 
 EMPCF_COMMENT("\n\n### Technology/Research/Education/Happiness")
@@ -355,7 +362,7 @@ EMPCFBOTH("MARK_DELAY", MARK_DELAY, int, NSC_INT, 0,
 EMPCFBOTH("TRADE_DELAY", TRADE_DELAY, int, NSC_INT, 0,
     "Time ships, planes, lands and nukes stay on the market for bidding (seconds)")
 EMPCFBOTH("buytax", buytax, double, NSC_DOUBLE, 0,
-    "Tax (in percentage points) charged to the buyer on market purchases")
+    "Multiple of the bid charged to the buyer on market purchases")
 EMPCFBOTH("tradetax", tradetax, double, NSC_DOUBLE, 0,
     "Amount of a trade transaction the seller makes (the rest is tax)")
 
@@ -386,6 +393,8 @@ EMPCFBOTH("news_keep_days", news_keep_days, int, NSC_INT, KM_INTERNAL,
     "How long until news expire")
 EMPCFBOTH("lost_keep_hours", lost_keep_hours, int, NSC_INT, KM_INTERNAL,
     "How long until lost items expire")
+EMPCFBOTH("running_test_suite", running_test_suite, int, NSC_INT, KM_INTERNAL,
+    "Are we running the test suite?  Must be 0 for games!")
 
 /* Sentinel */
 EMPCFONLYC(NULL, emp_config_dummy, NULL, NSC_NOTYPE, 0, NULL)