Update copyright notice

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

diff --git a/src/lib/subs/border.c b/src/lib/subs/border.c
index d6a57efbb4939cf55bbc8a40238ef4cc9c5d484b..1e79fb98d1afe40106ad5533831e1b1e864e057d 100644 (file)
--- a/src/lib/subs/border.c
+++ b/src/lib/subs/border.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, 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,50 +14,68 @@
  *  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.
  *
  *  ---
  *
  *  border.c: Create a border around a map
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "xy.h"
-#include "prototypes.h"
+#include "map.h"
 #include "optlist.h"
+#include "prototypes.h"
+#include "xy.h"
+
+/*
+ * space-fill a map or radar scan;
+ * null terminate
+ */
+void
+blankfill(char *ptr, struct range *range, int size)
+{
+    char *p;
+    int row;
+    int col;
+
+    for (row = 0; row < range->height; row++) {
+       col = (range->width + 1) * (size + 1) / 2 - 1;
+       p = ptr;
+       while (--col >= 0)
+           *p++ = ' ';
+       *p = 0;
+       ptr += MAPWIDTH(size);
+    }
+}
 
 void
-border(struct range *rp, s_char *prefstr, s_char *sep)
+border(struct range *rp, char *prefstr, char *sep)
 
                                /* prefixes each line */
                                /* separates the numbers */
 {
-    register int posi;
-    register int n;
-    register int x;
+    int posi, n, x;
 
     if ((WORLD_X / 2) >= 100) {
-       if (rp->lx + rp->width > 99 || rp->hx - rp->width < -99) {
+       if (rp->lx + rp->width > 100 || rp->hx - rp->width < -100) {
            /*
             * hundreds
             */
-           pr(prefstr);
+           pr("%s", prefstr);
            for (x = rp->lx, n = 0; n < rp->width; n++, x++) {
                if (x >= WORLD_X / 2)
                    x -= WORLD_X;
-               pr(sep);
+               pr("%s", sep);
                if (x < 0 && x > -100) {
                    pr("-");
                } else {
@@ -71,11 +89,11 @@ border(struct range *rp, s_char *prefstr, s_char *sep)
     /*
      * tens
      */
-    pr(prefstr);
+    pr("%s", prefstr);
     for (x = rp->lx, n = 0; n < rp->width; n++, x++) {
        if (x >= WORLD_X / 2)
            x -= WORLD_X;
-       pr(sep);
+       pr("%s", sep);
        if (x < 0 && x > -10) {
            pr("-");
        } else {
@@ -87,7 +105,7 @@ border(struct range *rp, s_char *prefstr, s_char *sep)
     /*
      * units...
      */
-    pr(prefstr);
+    pr("%s", prefstr);
     for (x = rp->lx, n = 0; n < rp->width; n++, x++) {
        if (x >= WORLD_X / 2)
            x -= WORLD_X;