Update copyright notice

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

diff --git a/src/lib/subs/getbit.c b/src/lib/subs/getbit.c
index 5a47d33060f6640c1d59547e652308a4ce614bac..dcded930a8185db7285afab5cfc0d6cd1ea7532b 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-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -33,16 +33,9 @@
 
 #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"
 
 /*
  *
@@ -125,7 +118,7 @@ static int *bitmaps[5] = {
 #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;
 
@@ -134,21 +127,20 @@ emp_getbit(int x, int y, u_char *bitmap)
 }
 
 void
-emp_setbit(int x, int y, u_char *bitmap)
+emp_setbit(int x, int y, unsigned char *bitmap)
 {
-    register int id;
+    int id;
 
     id = (GCFy(y)) * WORLD_X / 2 + GCFx(x) / 2;
     bitmap[id / 8] |= 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++;
@@ -159,7 +151,7 @@ emp_setbitmap(register int x, register int y, register u_char *bitmap,
 }
 
 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;