New journal event "output"

[empserver] / include / econfig-spec.h

diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index 447140a9fc6e1f7f3e782d73f878ed309ef4e276..552019cdacdadcbee1c15cd32713094319c329c7 100644 (file)
--- a/include/econfig-spec.h
+++ b/include/econfig-spec.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -29,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Marc Olzheim, 2004
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2011
  */
 
 /*
@@ -49,15 +48,15 @@
 
 #if    defined(EMP_CONFIG_C_OUTPUT)
 
-#define        EMPCFONLYC(fvname, vname, vtype, ctype, flags, descr)   \
+#define EMPCFONLYC(fvname, vname, vtype, ctype, flags, descr)  \
        { (fvname), (ctype), &(vname), (flags), (descr) },
-#define        EMPCFBOTH(fvname, vname, vtype, ctype, flags, descr)    \
+#define EMPCFBOTH(fvname, vname, vtype, ctype, flags, descr)   \
        { (fvname), (ctype), &(vname), (flags), (descr) },
 
 #elif  defined(EMP_CONFIG_H_OUTPUT)
 
-#define        EMPCFONLYC(fvname, vname, vtype, ctype, flags, descr)
-#define        EMPCFBOTH(fvname, vname, vtype, ctype, flags, descr)    \
+#define EMPCFONLYC(fvname, vname, vtype, ctype, flags, descr)
+#define EMPCFBOTH(fvname, vname, vtype, ctype, flags, descr)   \
        extern vtype vname;
 
 #endif /* EMP_CONFIG_C_OUTPUT || EMP_CONFIG_H_OUTPUT */
@@ -90,6 +89,9 @@ 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)\n")
 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,
@@ -143,6 +145,10 @@ EMPCF_OPT("BLITZ", opt_BLITZ,
     "Enable blitz mode")
 EMPCF_OPT("BRIDGETOWERS", opt_BRIDGETOWERS,
     "Allow bridge towers")
+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,
@@ -175,16 +181,12 @@ EMPCF_OPT("NO_FORT_FIRE", opt_NO_FORT_FIRE,
     "Disable fortress fire")
 EMPCF_OPT("NO_PLAGUE", opt_NO_PLAGUE,
     "Disable plague")
-EMPCF_OPT("PINPOINTMISSILE", opt_PINPOINTMISSILE,
-    "Enable marine missiles")
 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("SLOW_WAR", opt_SLOW_WAR,
-    "Declaring war takes time")
 EMPCF_OPT("SUPER_BARS", opt_SUPER_BARS,
     "Make bars immune to damage")
 EMPCF_OPT("TECH_POP", opt_TECH_POP,
@@ -209,8 +211,6 @@ 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,
     "Starting cash for new countries")
-EMPCFBOTH("war_cost", War_Cost, int, NSC_INT, 0,
-    "Cost to declare war (if SLOW_WAR is on)")
 
 EMPCF_COMMENT("\n\n### Technology/Research/Education/Happiness")
 EMPCFBOTH("easy_tech", easy_tech, float, NSC_FLOAT, 0,