client: Unbreak standalone build

[empserver] / include / news.h

diff --git a/include/news.h b/include/news.h
index d27e58c81b27048fb71f8f829f795482371247c8..12927101781d758441cd752e0a9ef46242ebac0f 100644 (file)
--- a/include/news.h
+++ b/include/news.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, 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/>.
  *
  *  ---
  *
@@ -31,6 +30,7 @@
  *     Dave Pare
  *     Thomas Ruschak
  *     Steve McClure
+ *     Markus Armbruster, 2004-2016
  */
 
 /*
@@ -41,14 +41,14 @@
 #ifndef NEWS_H
 #define NEWS_H
 
-#include <time.h>
+#include "file.h"
 #include "nsc.h"
 
 struct nwsstr {
     natid nws_ano;             /* "actor" country # */
     unsigned char nws_vrb;     /* action (verb) */
     natid nws_vno;             /* "victim" country # */
-    signed char nws_ntm;       /* number of times */
+    unsigned short nws_ntm;    /* number of times */
     short nws_duration;                /* last time at nws_when + nws_duration */
     time_t nws_when;           /* time of action */
 };
@@ -67,7 +67,7 @@ struct rptstr {
 #define N_SCT_LOSE     2
 #define N_SPY_SHOT     3
 #define N_SENT_TEL     4
-#define N_SIGN_TRE     5
+/* unused              5 */
 #define N_MAKE_LOAN    6
 #define N_REPAY_LOAN   7
 #define N_MAKE_SALE    8
@@ -84,8 +84,8 @@ struct rptstr {
 #define N_SHP_LOSE     19
 /* unused              20 */
 #define N_SEIZE_SECT   21
-#define N_HONOR_TRE    22
-#define N_VIOL_TRE     23
+/* unused              22 */
+/* unused              23 */
 /* unused              24 */
 #define N_HIT_MINE     25
 #define N_DECL_ALLY    26
@@ -108,7 +108,7 @@ struct rptstr {
 #define N_AIDS         43
 #define N_HURTS                44
 #define N_TAKE         45
-#define N_NUKE_STOP     46
+#define N_NUKE_STOP    46
 #define N_SCT_MISS     47
 #define N_SHP_MISS     48
 #define N_TRADE                49
@@ -122,19 +122,19 @@ struct rptstr {
 #define N_FIRE_F_ATTACK        57
 #define N_FIRE_L_ATTACK        58
 #define N_FIRE_S_ATTACK        59
-#define N_SACK_CAP      60
-#define N_UP_FRIENDLY   61
-#define N_DOWN_FRIENDLY 62
-#define N_UP_NEUTRAL    63
-#define N_DOWN_NEUTRAL  64
-#define N_UP_HOSTILE    65
-#define N_DOWN_HOSTILE  66
-#define N_SCT_SMISS     67
-#define N_SHP_SMISS     68
-#define N_START_COL     69
-#define N_NUKE_SSTOP    70
-#define N_LND_MISS      71
-#define N_LND_SMISS     72
+#define N_SACK_CAP     60
+#define N_UP_FRIENDLY  61
+#define N_DOWN_FRIENDLY        62
+#define N_UP_NEUTRAL   63
+#define N_DOWN_NEUTRAL 64
+#define N_UP_HOSTILE   65
+#define N_DOWN_HOSTILE 66
+#define N_SCT_SMISS    67
+#define N_SHP_SMISS    68
+#define N_START_COL    69
+#define N_NUKE_SSTOP   70
+#define N_LND_MISS     71
+#define N_LND_SMISS    72
 #define N_AWON_SECT    73
 #define N_PWON_SECT    74
 #define N_PARA_UNOCC   75
@@ -142,23 +142,23 @@ struct rptstr {
 #define N_PLOSE_SCT    77
 /* unused              78 */
 /* unused              79 */
-#define N_WELCH_DEAL    80
-#define N_LND_LOSE      81
-#define N_BOARD_LAND    82
+#define N_WELCH_DEAL   80
+#define N_LND_LOSE     81
+#define N_BOARD_LAND   82
 #define N_MAX_VERB     82
 
-#define N_NOTUSED        0
-#define N_FOR            1
-#define N_FRONT          2
-#define N_SEA            3
-#define N_SKY            4
-#define N_MISS           5
-#define N_ARTY           6
-#define N_ECON           7
-#define N_COLONY         8
-#define N_HOME           9
-#define N_SPY           10
-#define N_TELE          11
+#define N_NOTUSED       0
+#define N_FOR           1
+#define N_FRONT                 2
+#define N_SEA           3
+#define N_SKY           4
+#define N_MISS          5
+#define N_ARTY          6
+#define N_ECON          7
+#define N_COLONY        8
+#define N_HOME          9
+#define N_SPY          10
+#define N_TELE         11
 #define N_MAX_PAGE     11
 
 #define getnews(n, p) ef_read(EF_NEWS, (n), (p))