X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=include%2Fxy.h;h=c9367f9185a28d56eaa816a38a785c3351b7165e;hp=60c2c886031b238d617c218f0cbb8c8d08de1240;hb=HEAD;hpb=63bdc89835765a6163fe06e194fb3fbcc5dce083

diff --git a/include/xy.h b/include/xy.h
index 60c2c8860..c9367f918 100644
--- a/include/xy.h
+++ b/include/xy.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, 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,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,7 +25,7 @@
  *  ---
  *
  *  xy.h: Constants having to do with world locations.
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1998
  */
@@ -36,36 +35,37 @@
 
 #include "types.h"
 
-/* Used to calculate an offset into an array.  Used for
-   dynamically sizing the world. */
-#define XYOFFSET(x, y) (((y) * WORLD_X) + (x))
+/* Return the number of sectors in the world */
+#define WORLD_SZ() (WORLD_X * WORLD_Y / 2)
+
+/* Fast version of sctoff() for normalized arguments */
+#define XYOFFSET(x, y) (((y) * WORLD_X + (x)) / 2)
 
 #define XNORM(x) \
-    (((x) < 0) ? ((WORLD_X - (-(x) % WORLD_X)) % WORLD_X) : ((x) % WORLD_X))
+    (((x) < 0) ? (WORLD_X - 1 - ((-(x) - 1) % WORLD_X)) : ((x) % WORLD_X))
 #define YNORM(y) \
-    (((y) < 0) ? ((WORLD_Y - (-(y) % WORLD_Y)) % WORLD_Y) : ((y) % WORLD_Y))
+    (((y) < 0) ? (WORLD_Y - 1 - ((-(y) - 1) % WORLD_Y)) : ((y) % WORLD_Y))
 
 struct range {
-    coord lx;			/* low-range x,y */
-    coord ly;
-    coord hx;			/* high-range x,y */
-    coord hy;
-    int width;			/* range width, height */
-    int height;
+    coord lx, ly;		/* low-range x,y (inclusive) */
+    coord hx, hy;		/* high-range x,y (inclusive) */
+    int width, height;
 };
 
 extern char *xyas(coord x, coord y, natid country);
 extern char *ownxy(struct sctstr *sp);
 extern coord xrel(struct natstr *np, coord absx);
 extern coord yrel(struct natstr *np, coord absy);
-extern void xyrelrange(struct natstr *np, struct range *src,
-		       struct range *dst);
-extern void xyabsrange(struct natstr *np, struct range *src,
-		       struct range *dst);
+extern void xyrelrange(struct natstr *, struct range *, struct range *);
+extern void xyabsrange(struct natstr *, struct range *, struct range *);
+extern void xydist_range(coord, coord, int, struct range *);
+extern void xysize_range(struct range *);
 extern coord strtox(char *str, char **end);
 extern coord strtoy(char *str, char **end);
 extern coord xabs(struct natstr *np, coord relx);
 extern coord yabs(struct natstr *np, coord rely);
+extern int sctoff(coord x, coord y);
+extern void sctoff2xy(coord *, coord *, int);
 extern coord xnorm(coord x);
 extern coord ynorm(coord y);
 extern int xyinrange(coord x, coord y, struct range *rp);