client: Make get_password() not echo with POSIX && !HAVE_GETPASS

[empserver] / include / econfig-spec.h

diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index a3131e3c3c8f729a204900088ceb08b7ba2ca610..7608b32f95ad9987ae64eac6d97482afa4130d59 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-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2020, 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-2013
+ *     Markus Armbruster, 2004-2020
  */
 
 /*
@@ -108,9 +108,9 @@ EMPCFBOTH("privlog", privlog, char *, NSC_STRING, 0,
 EMPCFBOTH("privip", privip, char *, NSC_STRING, KM_INTERNAL,
     "Deities may connect from these IPs or networks, \"\" allows all")
 EMPCFBOTH("WORLD_X", WORLD_X, int, NSC_INT, 0,
-    "World size X dimension (enforced to be even by subtracting 1 if necessary)")
+    "World size X dimension, must be even")
 EMPCFBOTH("WORLD_Y", WORLD_Y, int, NSC_INT, 0,
-    "World size Y dimension")
+    "World size Y dimension, must be even")
 
 EMPCF_COMMENT("\n\n### Update policy\n\n"
     "# Note: the update schedule is defined in the file schedule in the\n"
@@ -189,14 +189,10 @@ EMPCF_OPT("RAILWAYS", opt_RAILWAYS,
     "Highways double as rail")
 EMPCF_OPT("RES_POP", opt_RES_POP,
     "Population is limited by research")
-EMPCF_OPT("SAIL", opt_SAIL,
-    "Enable sail command")
 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("TREATIES", opt_TREATIES,
-    "Allow treaties")
 
 EMPCF_COMMENT("\n\n### Countries")
 EMPCFBOTH("btu_build_rate", btu_build_rate, float, NSC_FLOAT, 0,
@@ -316,7 +312,7 @@ EMPCFBOTH("unit_damage", unit_damage, double, NSC_DOUBLE, 0,
 EMPCFBOTH("collateral_dam", collateral_dam, double, NSC_DOUBLE, 0,
     "Side effect damage amount done to sector")
 EMPCFBOTH("assault_penalty", assault_penalty, double, NSC_DOUBLE, 0,
-    "Attack strength multiplier for paratroopers and assaulting")
+    "Land unit strength multiplier for assaulting and boarding")
 EMPCFBOTH("fire_range_factor", fire_range_factor, float, NSC_FLOAT, 0,
     "Scale normal firing ranges by this amount")
 EMPCFBOTH("sect_mob_neg_factor", sect_mob_neg_factor, int, NSC_INT, 0,
@@ -337,7 +333,7 @@ EMPCFBOTH("money_uw", money_uw, double, NSC_DOUBLE, 0,
 EMPCFBOTH("babyeat", babyeat, double, NSC_DOUBLE, 0,
     "Amount of food to mature 1 baby into a civilian")
 EMPCFBOTH("bankint", bankint, double, NSC_DOUBLE, 0,
-    "Bank dollar gain (per bar per etu)")
+    "Bank dollar gain (per bar per ETU)")
 EMPCFBOTH("eatrate", eatrate, double, NSC_DOUBLE, 0,
     "Food eating rate for mature people")
 EMPCFBOTH("fcrate", fcrate, double, NSC_DOUBLE, 0,
@@ -395,6 +391,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)