Update copyright notice

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

diff --git a/src/lib/subs/bigmap.c b/src/lib/subs/bigmap.c
index b40e888a8099cb928fcdabf80b341097b07d1dbe..d1ceddb9190a3fb4267631674a88f099fbc66a05 100644 (file)
--- a/src/lib/subs/bigmap.c
+++ b/src/lib/subs/bigmap.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, 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,28 +14,28 @@
  *  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.
  *
  *  ---
  *
  *  bigmap.c:  Updates a player's sector map using sector offsets and
  *             simple overwrite rules.
- * 
+ *
  *  Known contributors to this file:
- *  
+ *
  */
 
-#include "misc.h"
-#include "player.h"
+#include <config.h>
+
 #include "file.h"
-#include "prototypes.h"
+#include "map.h"
+#include "sect.h"
 
 /* values of only_bmap:
  * 0 = update both maps
@@ -43,10 +43,10 @@
  * 2 = update only bmap with force
  */
 
-static int do_map_set(s_char *map, coord x, coord y, s_char t, int force);
+static int do_map_set(char *map, coord x, coord y, char t, int force);
 
 int
-map_set(natid cnum, coord x, coord y, s_char t, int only_bmap)
+map_set(natid cnum, coord x, coord y, char t, int only_bmap)
 {
     int set = 0;
 
@@ -61,10 +61,9 @@ map_set(natid cnum, coord x, coord y, s_char t, int only_bmap)
 
 
 static int
-do_map_set(s_char *map, coord x, coord y, s_char t, int force)
+do_map_set(char *map, coord x, coord y, char t, int force)
 {
     int id;
-    s_char ot;
 
     if ((id = sctoff(x, y)) < 0)
        return 0;
@@ -72,7 +71,6 @@ do_map_set(s_char *map, coord x, coord y, s_char t, int force)
     if (((map[id] == 'x') || (map[id] == 'X')) && !force)
        return 0;
 
-    ot = map[id];
     if (t == '?') {
        switch (map[id]) {
        case '.':