Update copyright notice

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

diff --git a/src/lib/subs/getbit.c b/src/lib/subs/getbit.c
index 4deb88ab1d0b216649662d3445c290ce82449af0..d48b6d176e26f58ab3c3bedf3125cd278c846eb1 100644 (file)
--- a/src/lib/subs/getbit.c
+++ b/src/lib/subs/getbit.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-2015, 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,35 +14,27 @@
  *  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.
  *
  *  ---
  *
  *  getbit.c: Replaces old bitmap code
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
-#include "nat.h"
-#include "prototypes.h"
 #include "optlist.h"
-
-
+#include "prototypes.h"
+#include "sect.h"
 
 /*
  *
@@ -121,45 +113,41 @@ static int *bitmaps[5] = {
     bitmap4,
 };
 
-#define GCFx(x) ((x + WORLD_X) % WORLD_X)
-#define GCFy(y) ((y + WORLD_Y) % WORLD_Y)
-
 int
-emp_getbit(int x, int y, u_char *bitmap)
+emp_getbit(int x, int y, unsigned char *bitmap)
 {
-    int id;
-
-    id = (GCFy(y)) * WORLD_X / 2 + GCFx(x) / 2;
-    return bitmap[id / 8] & bit(id & 07);
+    int id = sctoff(x, y);
+    if (id < 0)
+       return 0;
+    return bitmap[id >> 3] & bit(id & 07);
 }
 
 void
-emp_setbit(int x, int y, u_char *bitmap)
+emp_setbit(int x, int y, unsigned char *bitmap)
 {
-    register int id;
-
-    id = (GCFy(y)) * WORLD_X / 2 + GCFx(x) / 2;
-    bitmap[id / 8] |= bit(id & 07);
+    int id = sctoff(x, y);
+    if (id < 0)
+       return;
+    bitmap[id >> 3] |= bit(id & 07);
 }
 
-void
-emp_setbitmap(register int x, register int y, register u_char *bitmap,
-             int *bitmaps)
+static void
+emp_setbitmap(int x, int y, unsigned char *bitmap, int *bitmaps)
 {
-    register int *mp;
-    register int id;
-    register int dx, dy;
+    int *mp;
+    int id;
+    int dx, dy;
 
     for (mp = bitmaps; *mp != 9999;) {
        dx = x + *mp++;
        dy = y + *mp++;
-       id = (GCFy(dy)) * WORLD_X / 2 + GCFx(dx) / 2;
-       bitmap[id / 8] |= bit(id & 07);
+       id = sctoff(dx, dy);
+       bitmap[id >> 3] |= bit(id & 07);
     }
 }
 
 void
-bitinit2(struct nstr_sect *np, u_char *bitmap, int country)
+bitinit2(struct nstr_sect *np, unsigned char *bitmap, int country)
 {
     struct sctstr sect;
     int eff;