Update copyright notice

[empserver] / include / optlist.h

diff --git a/include/optlist.h b/include/optlist.h
index d9e823bcc301d0424d8da13db1e80368edf774fc..973daa84297758b8175ce8abcc2eca2aa6d067b4 100644 (file)
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,17 +19,18 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  optlist.h: Definitions of option listings
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2004-2008
  */
 
 #ifndef OPTLIST_H
@@ -37,7 +38,6 @@
 
 #include "nsc.h"
 
-/* Default econfig file */
 extern char dflt_econfig[];
 
 /* Game parameters, can be set in econfig */
@@ -45,16 +45,16 @@ extern char dflt_econfig[];
 #include "econfig-spec.h"
 #undef EMP_CONFIG_H_OUTPUT
 
-/* Variables that get values derived from econfig */
-extern char *motdfil;
-extern char *downfil;
-extern char *disablefil;
-extern char *banfil;
-extern char *authfil;
-extern char *annfil;
-extern char *timestampfil;
-extern char *teldir;
-extern char *telfil;
+extern char *configdir;
+extern char *builtindir;
+extern char *gamedir;
+extern char *infodir;
+extern char *schedulefil;
+
+extern char motdfil[];
+extern char downfil[];
+extern char annfil[];
+extern char teldir[];
 
 enum {
     KM_ALLOC = 1,              /* memory allocated */
@@ -62,9 +62,15 @@ enum {
     KM_OPTION = 4              /* historically an option */
 };
 
+enum {
+    UPD_DEMAND_NONE,           /* no demand updates */
+    UPD_DEMAND_SCHED,          /* scheduled updates are demand updates */
+    UPD_DEMAND_ASYNC,          /* zdone triggers unscheduled update */
+};
+
 struct keymatch {
     char *km_key;              /* the key */
-    nsc_type km_type;          /* type of associated data */
+    enum nsc_type km_type;     /* type of associated data */
     void *km_data;             /* pointer to associated data */
     int km_flags;              /* useful flags */
     char *km_comment;          /* Comment (hopefully useful) */