/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, 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,
* 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 "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
-#include "nat.h"
-#include "prototypes.h"
-#include "optlist.h"
-
-static int *bitmaps[];
-
-#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)
-{
- int id;
-
- id = (GCFy(y)) * WORLD_X / 2 + GCFx(x) / 2;
- return bitmap[id / 8] & bit(id & 07);
-}
-
-void
-emp_setbit(int x, int y, u_char *bitmap)
-{
- register 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)
-{
- register int *mp;
- register int id;
- register 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);
- }
-}
-
-void
-bitinit2(struct nstr_sect *np, u_char *bitmap, int country)
-{
- struct sctstr sect;
- int eff;
-
- while (nxtsct(np, §)) {
- if (sect.sct_own != country)
- continue;
- eff = sect.sct_effic / 20;
- if (eff > 4)
- eff = 4;
- emp_setbitmap(np->x, np->y, bitmap, bitmaps[eff]);
- }
- snxtsct_rewind(np);
-}
+#include <config.h>
+#include "optlist.h"
+#include "prototypes.h"
+#include "sect.h"
/*
*
bitmap3,
bitmap4,
};
+
+int
+emp_getbit(int x, int y, unsigned char *bitmap)
+{
+ 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 = sctoff(x, y);
+ if (id < 0)
+ return;
+ bitmap[id >> 3] |= bit(id & 07);
+}
+
+static void
+emp_setbitmap(int x, int y, unsigned char *bitmap, int *bitmaps)
+{
+ int *mp;
+ int id;
+ int dx, dy;
+
+ for (mp = bitmaps; *mp != 9999;) {
+ dx = x + *mp++;
+ dy = y + *mp++;
+ id = sctoff(dx, dy);
+ bitmap[id >> 3] |= bit(id & 07);
+ }
+}
+
+void
+bitinit2(struct nstr_sect *np, unsigned char *bitmap, int country)
+{
+ struct sctstr sect;
+ int eff;
+
+ while (nxtsct(np, §)) {
+ if (sect.sct_own != country)
+ continue;
+ eff = sect.sct_effic / 20;
+ if (eff > 4)
+ eff = 4;
+ emp_setbitmap(np->x, np->y, bitmap, bitmaps[eff]);
+ }
+ snxtsct_rewind(np);
+}