Update copyright notice

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

diff --git a/src/lib/subs/getbit.c b/src/lib/subs/getbit.c
index a66fab1f55622fc89f68fa0e2dcf969298c97a25..dcd7191dbcdcdfb86e12e788bb41e74de18ec128 100644 (file)
--- a/src/lib/subs/getbit.c
+++ b/src/lib/subs/getbit.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,23 +26,16 @@
  *  ---
  *
  *  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,25 +114,22 @@ 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, 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, unsigned char *bitmap)
 {
-    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);
 }
 
 static void
@@ -152,8 +142,8 @@ emp_setbitmap(int x, int y, unsigned char *bitmap, int *bitmaps)
     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);
     }
 }