COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/subs/bigmap.c b/src/lib/subs/bigmap.c
index 20ec874f4d2049c88b5b7186bdd3f184436cd718..53160972e1294f7928428a8ffa087c8b15b31c30 100644 (file)
--- a/src/lib/subs/bigmap.c
+++ b/src/lib/subs/bigmap.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.
  *
  *  ---
  *
@@ -32,6 +32,8 @@
  *  
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
 #include "file.h"
@@ -43,8 +45,7 @@
  * 2 = update only bmap with force
  */
 
-static int do_map_set(natid cnum, s_char *map, coord x, coord y,
-                     s_char t, int force, int sync);
+static int do_map_set(s_char *map, coord x, coord y, s_char t, int force);
 
 int
 map_set(natid cnum, coord x, coord y, s_char t, int only_bmap)
@@ -54,17 +55,15 @@ map_set(natid cnum, coord x, coord y, s_char t, int only_bmap)
     if (!t)
        return 0;
     if (!only_bmap)
-       set |= do_map_set(cnum, ef_ptr(EF_MAP, cnum), x, y, t, 0, 0);
-    set |=
-       do_map_set(cnum, ef_ptr(EF_BMAP, cnum), x, y, t, only_bmap > 1, 1);
+       set |= do_map_set(ef_ptr(EF_MAP, cnum), x, y, t, 0);
+    set |= do_map_set(ef_ptr(EF_BMAP, cnum), x, y, t, only_bmap > 1);
 
     return set;
 }
 
 
 static int
-do_map_set(natid cnum, s_char *map, coord x, coord y, s_char t, int force,
-          int sync)
+do_map_set(s_char *map, coord x, coord y, s_char t, int force)
 {
     int id;
     s_char ot;