Update known contributors comments

[empserver] / src / lib / common / xy.c

diff --git a/src/lib/common/xy.c b/src/lib/common/xy.c
index cd136787e2e839b1d0a06fa267b94dcbea1a2ebe..150828a20eab038261d4b0c092a8d12362b8f050 100644 (file)
--- a/src/lib/common/xy.c
+++ b/src/lib/common/xy.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,9 +25,10 @@
  *  ---
  *
  *  xy.c: x-y related conversion routines
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
+ *     Markus Armbruster, 2004-2011
  */
 
 #include <config.h>
@@ -71,8 +71,6 @@ xrel(struct natstr *np, coord absx)
     x = XNORM(absx - np->nat_xorg);
     if (x >= WORLD_X / 2)
        x -= WORLD_X;
-    else if (x < -WORLD_X / 2)
-       x += WORLD_X;
     return x;
 }
 
@@ -84,8 +82,6 @@ yrel(struct natstr *np, coord absy)
     y = YNORM(absy - np->nat_yorg);
     if (y >= WORLD_Y / 2)
        y -= WORLD_Y;
-    else if (y < -WORLD_Y / 2)
-       y += WORLD_Y;
     return y;
 }
 
@@ -111,6 +107,47 @@ xyabsrange(struct natstr *np, struct range *src, struct range *dst)
     dst->height = src->height;
 }
 
+void
+xysize_range(struct range *rp)
+{
+    if (rp->lx > rp->hx)
+       rp->width = WORLD_X + rp->hx + 1 - rp->lx;
+    else
+       rp->width = rp->hx + 1 - rp->lx;
+    if (CANT_HAPPEN(rp->width > WORLD_X))
+       rp->width = WORLD_X;
+    if (rp->ly > rp->hy)
+       rp->height = WORLD_Y + rp->hy + 1 - rp->ly;
+    else
+       rp->height = rp->hy + 1 - rp->ly;
+    if (CANT_HAPPEN(rp->height > WORLD_Y))
+       rp->height = WORLD_Y;
+}
+
+void
+xydist_range(coord x, coord y, int dist, struct range *rp)
+{
+    if (4 * dist + 1 < WORLD_X) {
+       rp->lx = xnorm(x - 2 * dist);
+       rp->hx = xnorm(x + 2 * dist);
+       rp->width = 4 * dist + 1;
+    } else {
+       rp->lx = xnorm(x - WORLD_X / 2);
+       rp->hx = xnorm(rp->lx + WORLD_X - 1);
+       rp->width = WORLD_X;
+    }
+
+    if (2 * dist + 1 < WORLD_Y) {
+       rp->ly = ynorm(y - dist);
+       rp->hy = ynorm(y + dist);
+       rp->height = 2 * dist + 1;
+    } else {
+       rp->ly = ynorm(y - WORLD_Y / 2);
+       rp->hy = ynorm(rp->ly + WORLD_Y - 1);
+       rp->height = WORLD_Y;
+    }
+}
+
 /*
  * Convert initial part of STR to normalized x-coordinate.
  * Return -1 on error.  This works, as normalized coordinates are
@@ -174,23 +211,19 @@ sctoff(coord x, coord y)
 coord
 xnorm(coord x)
 {
-    if (x < 0)
-       x = WORLD_X - (-x % WORLD_X);
-    return x % WORLD_X;
+    return XNORM(x);
 }
 
 coord
 ynorm(coord y)
 {
-    if (y < 0)
-       y = WORLD_Y - (-y % WORLD_Y);
-    return y % WORLD_Y;
+    return YNORM(y);
 }
 
 int
 xyinrange(coord x, coord y, struct range *rp)
 {
-    if (rp->lx < rp->hx) {
+    if (rp->lx <= rp->hx) {
        /* xrange doesn't wrap */
        if (x < rp->lx || x > rp->hx)
            return 0;
@@ -198,7 +231,7 @@ xyinrange(coord x, coord y, struct range *rp)
        if (x < rp->lx && x > rp->hx)
            return 0;
     }
-    if (rp->ly < rp->hy) {
+    if (rp->ly <= rp->hy) {
        /* yrange doesn't wrap */
        if (y < rp->ly || y > rp->hy)
            return 0;