client: Unbreak standalone build

[empserver] / include / player.h

diff --git a/include/player.h b/include/player.h
index afe0ec9c2fcf80a35a68815776c35f75c7668c6e..f9d79cd98f49f6f4fb6561f60caa80b7ac4a6b60 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-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Doug Hay, 1998
- *     Markus Armbruster, 2005-2010
+ *     Markus Armbruster, 2005-2014
  */
 
 #ifndef PLAYER_H
@@ -41,14 +41,15 @@
 #include "queue.h"
 #include "types.h"
 
-       /* nstat values */
-#define VIS            bit(0)
-#define SANCT          (bit(1) | VIS)
-#define NORM           (bit(2) | VIS)
-#define GOD            (bit(3) | NORM | VIS)
-#define EXEC           bit(5)
-#define CAP            bit(6)
-#define MONEY          bit(7)
+       /* player command capabilities */
+#define NONVIS bit(0)  /* can execute common commands (visitors can't) */
+#define SANCT  bit(1)  /* can execute commands available in sanctuary */
+#define NORM   bit(2)  /* can execute active player commands */
+#define GOD    bit(3)  /* can execute deity commands */
+#define TESTING        bit(4)  /* can execute commands meant for test suite */
+#define EXEC   bit(5)  /* can execute the execute command */
+#define CAP    bit(6)  /* has capital */
+#define MONEY  bit(7)  /* isn't broke */
 
 enum player_sleep {
     PLAYER_SLEEP_NEVER, PLAYER_SLEEP_ON_INPUT, PLAYER_SLEEP_FREELY
@@ -58,7 +59,6 @@ struct player {
     struct emp_qelem queue;
     empth_t *proc;
     char hostaddr[46];
-    char hostname[512];                /* may be empty */
     char client[128];          /* may be empty */
     char userid[32];           /* may be empty */
     int authenticated;
@@ -81,10 +81,10 @@ struct player {
     double dolcost;
     time_t curup;              /* when last input was received */
     enum player_sleep may_sleep; /* when may thread sleep? */
-    int aborted;               /* interrupt cookie or EOF received? */
-    int eof;                   /* EOF (cookie or real) received? */
+    int aborted;               /* command aborted? */
+    int got_ctld;              /* EOF cookie received? */
     int recvfail;              /* #recvclient() failures */
-    int curid;                 /* for pr, cur. line's id, -1 none */
+    int curid;                 /* for pr, cur. line's ID, -1 none */
     char *map;                 /* pointer to in-mem map */
     char *bmap;                        /* pointer to in-mem bmap */
 };