Update copyright notice

[empserver] / src / lib / subs / trechk.c

diff --git a/src/lib/subs/trechk.c b/src/lib/subs/trechk.c
index 4b92422aa075ba06a253cec1de60661f315d1ce6..70244704874decbb3ddf1f8beb6740979ae4c024 100644 (file)
--- a/src/lib/subs/trechk.c
+++ b/src/lib/subs/trechk.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, 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,23 +14,22 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  trechk.c: Check to see if an actor has violated a treaty.
- * 
- *  Known contributors to this file: 
- *      Steve McClure, 1998-1999
- *     
+ *
+ *  Known contributors to this file:
+ *     Steve McClure, 1998-1999
  */
+
 /*
  * Check to see if an actor has a treaty forbidding a given action,
  * and if so, see if the actor wishes to break the treaty.
@@ -39,21 +38,20 @@
  * but no mention of broken pending treaties are made in the news.
  */
 
-#include "misc.h"
-#include "treaty.h"
+#include <config.h>
+
+#include "file.h"
 #include "nat.h"
 #include "news.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
-#include "prototypes.h"
 #include "optlist.h"
+#include "prototypes.h"
+#include "treaty.h"
 
 int
-trechk(register natid actor, register natid victim, int provision)
+trechk(natid actor, natid victim, int provision)
 {
-    register natid cn;
-    s_char buf[1024];
+    natid cn;
+    char buf[1024];
     int news_verb;
     int involved[MAXNOC];
     struct trtstr treaty;
@@ -72,7 +70,7 @@ trechk(register natid actor, register natid victim, int provision)
     for (cn = 0; cn < MAXNOC; cn++)
        involved[cn] = 0;
     snxtitem_all(&nstr, EF_TREATY);
-    while (nxtitem(&nstr, (s_char *)&treaty)) {
+    while (nxtitem(&nstr, &treaty)) {
        if (treaty.trt_status == TS_FREE)
            continue;
        if (treaty.trt_exp < now)