Extend the common header of struct empobj to include uid

[empserver] / include / news.h

diff --git a/include/news.h b/include/news.h
index fd27ae363193612b3d2863cf89d8dd730e42dafe..cc182a9109a14a72f7be77cc93d326b7f346166d 100644 (file)
--- a/include/news.h
+++ b/include/news.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -41,12 +41,15 @@
 #ifndef NEWS_H
 #define NEWS_H
 
+#include <time.h>
 #include "nsc.h"
 
 struct nwsstr {
+    /* initial part must match struct empobj */
     short ef_type;
-    natid nws_ano;             /* "actor" country # */
     short nws_uid;             /* unused */
+    /* end of part matching struct empobj */
+    natid nws_ano;             /* "actor" country # */
     signed char nws_vrb;       /* action (verb) */
     natid nws_vno;             /* "victim" country # */
     signed char nws_ntm;       /* number of times */
@@ -163,7 +166,7 @@ struct rptstr {
 
 #define getnews(n, p) ef_read(EF_NEWS, (n), (p))
 #define putnews(n, p) ef_write(EF_NEWS, (n), (p))
-#define getnewsp(n) (struct nwsstr *)ef_ptr(EF_NEWS, (n))
+#define getnewsp(n) ((struct nwsstr *)ef_ptr(EF_NEWS, (n)))
 
 extern struct rptstr rpt[N_MAX_VERB + 2];
 extern struct symbol page_headings[N_MAX_PAGE + 2];