License upgrade to GPL version 3 or later

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

diff --git a/src/lib/subs/paths.c b/src/lib/subs/paths.c
index e63d6fad52b9edac1f4f6186547b38efd3030297..546d11dd79f459b9e143b40cf01f459f2b2c5b15 100644 (file)
--- a/src/lib/subs/paths.c
+++ b/src/lib/subs/paths.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, 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,14 +25,15 @@
  *  ---
  *
  *  path.c: Routines associated with paths, directions, etc.
- * 
+ *
  *  Known contributors to this file:
- *   
+ *     Markus Armbruster, 2005-2009
  */
 
 #include <config.h>
 
 #include "file.h"
+#include "optlist.h"
 #include "path.h"
 #include "player.h"
 #include "prototypes.h"
@@ -57,11 +57,11 @@ direrr(char *stop_msg, char *view_msg, char *map_msg)
     pr(" %c %c\n", dirch[DIR_UL], dirch[DIR_UR]);
     pr("%c   %c\n", dirch[DIR_L], dirch[DIR_R]);
     pr(" %c %c\n", dirch[DIR_DL], dirch[DIR_DR]);
-    if (stop_msg != 0)
+    if (stop_msg)
        pr(stop_msg, dirch[DIR_STOP]);
-    if (view_msg != 0)
+    if (view_msg)
        pr(view_msg, dirch[DIR_VIEW]);
-    if (map_msg != 0)
+    if (map_msg)
        pr(map_msg, dirch[DIR_MAP]);
 }
 
@@ -108,10 +108,8 @@ getpath(char *buf, char *arg, coord x, coord y, int onlyown,
     }
 
     getsect(x, y, &sect);
-    nx = x;
-    ny = y;
 
-  more:
+more:
     while (*p) {
        if (sarg_xy(p, &dx, &dy)) {
            bp = NULL;
@@ -120,10 +118,10 @@ getpath(char *buf, char *arg, coord x, coord y, int onlyown,
                pr("Destination sectors not allowed here!\n");
                break;
            case P_FLYING:
-               bp = BestAirPath(buf2, nx, ny, dx, dy);
+               bp = BestAirPath(buf2, x, y, dx, dy);
                break;
            case P_SAILING:
-               bp = BestShipPath(buf2, nx, ny, dx, dy, player->cnum);
+               bp = BestShipPath(buf2, x, y, dx, dy, player->cnum);
                break;
            }
            if (bp && p + strlen(bp) + 1 < buf + MAX_PATH_LEN) {
@@ -156,8 +154,8 @@ getpath(char *buf, char *arg, coord x, coord y, int onlyown,
            return buf;
        }
        ++p;
-       x = nx;
-       y = ny;
+       x = sect.sct_x;
+       y = sect.sct_y;
     }
     fly_map(x, y);
     if (showdes) {
@@ -169,13 +167,13 @@ getpath(char *buf, char *arg, coord x, coord y, int onlyown,
                xyas(x, y, player->cnum));
     }
     bp = getstring(prompt, buf2);
-    if (bp && p + strlen(bp) + 1 >= buf + MAX_PATH_LEN) {
+    if (!bp)
+       return NULL;
+    if (p + strlen(bp) + 1 >= buf + MAX_PATH_LEN) {
        pr("Path length may not exceed %d.\n", MAX_PATH_LEN);
        pr("Aborting...\n");
-       bp = NULL;
-    }
-    if (!bp)
        return NULL;
+    }
     strcpy(p, bp);
     if (*bp)
        goto more;
@@ -237,32 +235,34 @@ pathtoxy(char *path, coord *xp, coord *yp,
 void
 pathrange(coord cx, coord cy, char *pp, int border, struct range *range)
 {
-    int dir;
+    int dir, lx, ly, hx, hy;
 
-    range->lx = cx;
-    range->hx = cx;
-    range->ly = cy;
-    range->hy = cy;
-    range->width = 0;
-    range->height = 0;
+    lx = hx = cx;
+    ly = hy = cy;
     for (; *pp; pp++) {
        dir = diridx(*pp);
        if (dir == DIR_STOP)
            break;
        cx += diroff[dir][0];
        cy += diroff[dir][1];
-       if (cx < range->lx)
-           range->lx = cx;
-       if (cx > range->hx)
-           range->hx = cx;
-       if (cy < range->ly)
-           range->ly = cy;
-       if (cy > range->hy)
-           range->hy = cy;
+       if (cx < lx)
+           lx = cx;
+       if (cx > hx)
+           hx = cx;
+       if (cy < ly)
+           ly = cy;
+       if (cy > hy)
+           hy = cy;
     }
-    range->lx = xnorm(range->lx - border * 2);
-    range->ly = ynorm(range->ly - border);
-    range->hx = xnorm(range->hx + border * 2 + 1);
-    range->hy = ynorm(range->hy + border + 1);
+
+    lx -= border * 2;
+    hx += border * 2;
+    ly -= border;
+    hy += border;
+
+    range->lx = xnorm(lx);
+    range->hx = xnorm(hx - lx < WORLD_X ? hx : lx - 1);
+    range->ly = ynorm(ly);
+    range->hy = ynorm(hy - ly < WORLD_Y ? hy : ly - 1);
     xysize_range(range);
 }