COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/common/bridgefall.c b/src/lib/common/bridgefall.c
index 13fc7ed28d4d82ea4177f96dd2640f0cd97a7137..e321cba991007b3228a16549539dc27b45c058d4 100644 (file)
--- a/src/lib/common/bridgefall.c
+++ b/src/lib/common/bridgefall.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, 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,8 +31,10 @@
  *     Steve McClure, 1998
  */
 
+#include <config.h>
+
 #include "misc.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "path.h"
 #include "file.h"
@@ -48,8 +50,8 @@
 void
 bridgefall(struct sctstr *sp, struct emp_qelem *list)
 {
-    register int i;
-    register int j;
+    int i;
+    int j;
     struct sctstr sect;
     struct sctstr bh_sect;
     int nx;
@@ -117,7 +119,7 @@ knockdown(struct sctstr *sp, struct emp_qelem *list)
 
     /* Sink all the units */
     snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y);
-    while (nxtitem(&ni, (s_char *)&land)) {
+    while (nxtitem(&ni, &land)) {
        if (land.lnd_own == 0)
            continue;
        if (land.lnd_x != sp->sct_x || land.lnd_y != sp->sct_y)
@@ -137,7 +139,7 @@ knockdown(struct sctstr *sp, struct emp_qelem *list)
     }
     /* Sink all the planes */
     snxtitem_xy(&ni, EF_PLANE, sp->sct_x, sp->sct_y);
-    while (nxtitem(&ni, (s_char *)&plane)) {
+    while (nxtitem(&ni, &plane)) {
        if (plane.pln_own == 0)
            continue;
        if (plane.pln_x != sp->sct_x || plane.pln_y != sp->sct_y)