COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / common / land.c

diff --git a/src/lib/common/land.c b/src/lib/common/land.c
index 5918fb278605683d14131e271d17e6f10fba30fd..f277b62d0b843f9efd299a8b2f7c2481d2530490 100644 (file)
--- a/src/lib/common/land.c
+++ b/src/lib/common/land.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, 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.
  *
  *  ---
  *
@@ -31,11 +31,11 @@
  *     
  */
 
+#include <config.h>
+
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
-#include "var.h"
 #include "file.h"
 #include "path.h"
 #include "xy.h"
@@ -47,7 +47,7 @@
 int
 adj_units(coord x, coord y, natid own)
 {
-    register int i;
+    int i;
     struct sctstr sect;
 
     for (i = DIR_FIRST; i <= DIR_LAST; i++) {
@@ -61,10 +61,10 @@ adj_units(coord x, coord y, natid own)
 int
 has_units(coord x, coord y, natid cn, struct lndstr *lp)
 {
-    register int n;
+    int n;
     struct lndstr land;
 
-    for (n = 0; ef_read(EF_LAND, n, (s_char *)&land); n++) {
+    for (n = 0; ef_read(EF_LAND, n, &land); n++) {
        if (land.lnd_x != x || land.lnd_y != y)
            continue;
        if (lp) {
@@ -87,7 +87,7 @@ has_units_with_mob(coord x, coord y, natid cn)
     struct lndstr land;
 
     snxtitem_xy(&ni, EF_LAND, x, y);
-    while (nxtitem(&ni, (s_char *)&land)) {
+    while (nxtitem(&ni, &land)) {
        if (land.lnd_own != cn)
            continue;
        if (land.lnd_mobil > 0)
@@ -107,7 +107,7 @@ has_helpful_engineer(coord x, coord y, natid cn)
     struct lndstr land;
 
     snxtitem_xy(&ni, EF_LAND, x, y);
-    while (nxtitem(&ni, (s_char *)&land)) {
+    while (nxtitem(&ni, &land)) {
        if (land.lnd_own != cn && getrel(getnatp(land.lnd_own), cn) != ALLIED)
            continue;
        if (lchr[(int)land.lnd_type].l_flags & L_ENGINEER)