Update copyright notice

[empserver] / include / xy.h

diff --git a/include/xy.h b/include/xy.h
index b427ee2af9d34ce468fe985740685fd551d27068..851d3d1cfd5b48f3af5a5ed8937039554b78011e 100644 (file)
--- a/include/xy.h
+++ b/include/xy.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
  *  ---
  *
  *  xy.h: Constants having to do with world locations.
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1998
  */
@@ -43,17 +43,14 @@
 #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);