Fix trailing whitespace

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

diff --git a/src/lib/subs/bigmap.c b/src/lib/subs/bigmap.c
index ea3b5553951f6ee28f13b33f918646117a6e1676..3f21514e9ff8c99da7f9f05e9175c5812ace8d7d 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-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,23 +19,24 @@
  *
  *  ---
  *
- *  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,63 +44,60 @@
  * 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(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;
+    int set = 0;
 
-       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);
+    if (!t)
+       return 0;
+    if (!only_bmap)
+       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;
+    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(char *map, coord x, coord y, char t, int force)
 {
-       int     id;
-       s_char  ot;
+    int id;
 
-       if ((id = sctoff(x, y)) < 0)
-               return 0;
+    if ((id = sctoff(x, y)) < 0)
+       return 0;
 
-       if (((map[id] == 'x') || (map[id] == 'X')) && !force)
-               return 0;
+    if (((map[id] == 'x') || (map[id] == 'X')) && !force)
+       return 0;
 
-       ot = map[id];
-       if (t == '?') {
-               switch (map[id]) {
-               case '.':
-               case '-':
-               case ' ':
-               case   0:
-                       map[id] = t;
-                       break;
-               default:
-                       break;
-               }
-       } else {
-               map[id] = t;
+    if (t == '?') {
+       switch (map[id]) {
+       case '.':
+       case '-':
+       case ' ':
+       case 0:
+           map[id] = t;
+           break;
+       default:
+           break;
        }
-       return 1;
+    } else {
+       map[id] = t;
+    }
+    return 1;
 }
 
 void
 writebmap(natid cnum)
 {
-       ef_write(EF_BMAP, cnum, ef_ptr(EF_BMAP,cnum));
+    ef_write(EF_BMAP, cnum, ef_ptr(EF_BMAP, cnum));
 }
 
 void
 writemap(natid cnum)
 {
-       ef_write(EF_MAP, cnum, ef_ptr(EF_MAP,cnum));
-       ef_write(EF_BMAP, cnum, ef_ptr(EF_BMAP,cnum));
+    ef_write(EF_MAP, cnum, ef_ptr(EF_MAP, cnum));
+    ef_write(EF_BMAP, cnum, ef_ptr(EF_BMAP, cnum));
 }