COPYING duplicates information from README. Remove. Move GPL from

[empserver] / include / player.h

diff --git a/include/player.h b/include/player.h
index cae5093aa08ff0a81e31d1b7da46e89af79b4837..36a178441b1b8d6362895bf340f50284e1480247 100644 (file)
--- a/include/player.h
+++ b/include/player.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -32,52 +32,52 @@
  *     Doug Hay, 1998
  */
 
-#ifndef _PLAYER_H_
-#define _PLAYER_H_
+#ifndef PLAYER_H
+#define PLAYER_H
 
 #include <sys/types.h>
 #if !defined(_WIN32)
 #include <netinet/in.h>
 #endif
-#include "prototype.h"
 #include "queue.h"
 #include "misc.h"
 #include "com.h"
 #include "empthread.h"
 
 struct player {
-       struct emp_qelem queue;
-       empth_t *proc;
-       s_char  hostaddr[32];
-       s_char  hostname[512];
-       s_char  client[128];
-       s_char  userid[32];
-       int     validated;
-       natid   cnum;
-       int     state;
-       struct cmndstr *command;
-       struct iop *iop;
-       s_char  combuf[1024];
-       s_char  *argp[128];
-       s_char  *condarg;
-       time_t  lasttime;
-       int     ncomstat;
-       int     minleft;
-       int     btused;
-       int     visitor;
-       int     god;
-       int     owner;
-       int     nstat;
-       int     waiting;
-       int     simulation;             /* e.g. budget command */
-       double  dolcost;
-       int     broke;
-       time_t  curup;                   /* used in calc of minutes used */
-       int     aborted;
-       int     curid;                  /* for pr, cur. line's id, -1 none */
-       int     blitz_time;
-       char    *map;                   /* pointer to in-mem map */
-       char    *bmap;                  /* pointer to in-mem bmap */
+    struct emp_qelem queue;
+    empth_t *proc;
+    char hostaddr[32];
+    char hostname[512];                /* may be empty */
+    char client[128];          /* may be empty */
+    char userid[32];           /* may be empty */
+    int validated;
+    natid cnum;
+    int state;
+    int flags;
+    struct cmndstr *command;
+    struct iop *iop;
+    char combuf[1024];         /* command input buffer, UTF-8 */
+    char *argp[128];           /* arguments, ASCII */
+    char *condarg;             /* conditional, ASCII */
+    time_t lasttime;
+    int ncomstat;
+    int minleft;
+    int btused;
+    int visitor;
+    int god;
+    int owner;
+    int nstat;
+    int waiting;
+    int simulation;            /* e.g. budget command */
+    double dolcost;
+    int broke;
+    time_t curup;              /* used in calc of minutes used */
+    int aborted;
+    int curid;                 /* for pr, cur. line's id, -1 none */
+    int blitz_time;
+    char *map;                 /* pointer to in-mem map */
+    char *bmap;                        /* pointer to in-mem bmap */
 };
 
 #define PS_INIT                0
@@ -86,21 +86,9 @@ struct player {
 #define PS_SHUTDOWN    3
 #define PS_KILL                4
 
-/* thread priorities */
-#define PP_UPDATE      6
-#define PP_SHUTDOWN    5
-#define PP_SCHED       4
-#define PP_TIMESTAMP    2
-#define PP_PLAYER      3
-#define PP_ACCEPT      3
-#define PP_KILLIDLE    2
-
-#include "prototypes.h" /* must come at end, after defines and typedefs */
-
-#endif /* _PLAYER_H_ */
-
-
-
-
-
+/* player flags */
+enum {
+    PF_UTF8 = bit(0)                   /* client wants UTF-8 */
+};
 
+#endif