Fix trailing whitespace

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

diff --git a/src/lib/subs/snxtsct.c b/src/lib/subs/snxtsct.c
index 9cca4b46a59d222ffa211a4b4628088ad8858c1e..7f2248b111bbb1f84b26455938e1c8a181ef067c 100644 (file)
--- a/src/lib/subs/snxtsct.c
+++ b/src/lib/subs/snxtsct.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, 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
@@ -26,9 +26,10 @@
  *  ---
  *
  *  snxtsct.c: Arrange sector selection using either distance or area
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
+ *     Markus Armbruster, 2006-2008
  */
 
 #include <config.h>
@@ -83,9 +84,9 @@ snxtsct(struct nstr_sect *np, char *str)
        natp = getnatp(player->cnum);
        range.lx = xabs(natp, -WORLD_X / 2);
        range.ly = yabs(natp, -WORLD_Y / 2);
-       range.hx = xabs(natp, WORLD_X / 2);
-       range.hy = yabs(natp, WORLD_Y / 2);
-       range.width = range.height = 0;
+       range.hx = xnorm(range.lx + WORLD_X - 1);
+       range.hy = ynorm(range.ly + WORLD_Y - 1);
+       xysize_range(&range);
        snxtsct_area(np, &range);
        break;
     default:
@@ -104,11 +105,11 @@ snxtsct_all(struct nstr_sect *np)
 {
     struct range worldrange;
 
-    worldrange.lx = -WORLD_X / 2;
-    worldrange.ly = -WORLD_Y / 2;
-    worldrange.hx = WORLD_X / 2;
-    worldrange.hy = WORLD_Y / 2;
-    worldrange.width = worldrange.height = 0;
+    worldrange.lx = 0;
+    worldrange.ly = 0;
+    worldrange.hx = WORLD_X - 1;
+    worldrange.hy = WORLD_Y - 1;
+    xysize_range(&worldrange);
     snxtsct_area(np, &worldrange);
 }
 
@@ -119,12 +120,10 @@ snxtsct_area(struct nstr_sect *np, struct range *range)
     np->range = *range;
     np->ncond = 0;
     np->type = NS_AREA;
-    np->read = ef_read;
     np->x = np->range.lx - 1;
     np->y = np->range.ly;
     np->dx = -1;
     np->dy = 0;
-    xysize_range(&np->range);
 }
 
 void
@@ -147,65 +146,49 @@ snxtsct_dist(struct nstr_sect *np, coord cx, coord cy, int dist)
     np->ncond = 0;
     np->dist = dist;
     np->type = NS_DIST;
-    np->read = ef_read;
     np->x = np->range.lx - 1;
     np->y = np->range.ly;
     np->dx = -1;
     np->dy = 0;
-#if 0
-    /* This function is now done elsewhere. */
-    /* It was not doing the right thing when the world was small */
-    xysize_range(&np->range);
-#endif
 }
 
 void
 xysize_range(struct range *rp)
 {
-    if (rp->lx >= rp->hx)
-       rp->width = WORLD_X + rp->hx - rp->lx;
+    if (rp->lx > rp->hx)
+       rp->width = WORLD_X + rp->hx + 1 - rp->lx;
     else
-       rp->width = rp->hx - rp->lx;
-#ifndef HAY
-    /* This is a necessary check for small, hitech worlds. */
-    if (rp->width > WORLD_X)
+       rp->width = rp->hx + 1 - rp->lx;
+    if (CANT_HAPPEN(rp->width > WORLD_X))
        rp->width = WORLD_X;
-#endif
-    if (rp->ly >= rp->hy)
-       rp->height = WORLD_Y + rp->hy - rp->ly;
+    if (rp->ly > rp->hy)
+       rp->height = WORLD_Y + rp->hy + 1 - rp->ly;
     else
-       rp->height = rp->hy - rp->ly;
-#ifndef HAY
-    /* This is a necessary check for small, hitech worlds. */
-    if (rp->height > WORLD_Y)
+       rp->height = rp->hy + 1 - rp->ly;
+    if (CANT_HAPPEN(rp->height > WORLD_Y))
        rp->height = WORLD_Y;
-#endif
 }
 
-/* This is called also called in snxtitem.c */
 void
 xydist_range(coord x, coord y, int dist, struct range *rp)
 {
-    if (dist < WORLD_X / 4) {
-       rp->lx = xnorm((coord)(x - 2 * dist));
-       rp->hx = xnorm((coord)(x + 2 * dist) + 1);
+    if (4 * dist + 1 < WORLD_X) {
+       rp->lx = xnorm(x - 2 * dist);
+       rp->hx = xnorm(x + 2 * dist);
        rp->width = 4 * dist + 1;
     } else {
-       /* Range is larger than the world */
-       /* Make sure we get lx in the right place. */
-       rp->lx = xnorm((coord)(x - WORLD_X / 2));
-       rp->hx = xnorm((coord)(rp->lx + WORLD_X - 1));
+       rp->lx = xnorm(x - WORLD_X / 2);
+       rp->hx = xnorm(rp->lx + WORLD_X - 1);
        rp->width = WORLD_X;
     }
 
-    if (dist < WORLD_Y / 2) {
-       rp->ly = ynorm((coord)(y - dist));
-       rp->hy = ynorm((coord)(y + dist) + 1);
+    if (2 * dist + 1 < WORLD_Y) {
+       rp->ly = ynorm(y - dist);
+       rp->hy = ynorm(y + dist);
        rp->height = 2 * dist + 1;
     } else {
-       /* Range is larger than the world */
-       rp->ly = ynorm((coord)(y - WORLD_Y / 2));
-       rp->hy = ynorm((coord)(rp->ly + WORLD_Y - 1));
+       rp->ly = ynorm(y - WORLD_Y / 2);
+       rp->hy = ynorm(rp->ly + WORLD_Y - 1);
        rp->height = WORLD_Y;
     }
 }