/*
* 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-2020, 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,
* 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/>.
*
* ---
*
*
* ---
*
- * path.c: Routines associated with paths, directions, etc.
- *
+ * paths.c: Routines associated with paths, directions, etc.
+ *
* Known contributors to this file:
- *
+ * Markus Armbruster, 2005-2020
*/
#include <config.h>
-#include "file.h"
+#include "optlist.h"
#include "path.h"
#include "player.h"
#include "prototypes.h"
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]);
}
/*
- * Map direction DIR to a direction index DIR_STOP..DIR_LAST.
- * DIR must be a valid direction.
+ * Map direction @dir to a direction index DIR_STOP..DIR_LAST.
+ * @dir must be a valid direction.
*/
int
diridx(char dir)
{
unsigned i = dir - 'a';
- if (CANT_HAPPEN(i >= sizeof(dirindex) / sizeof(*dirindex)
+ if (CANT_HAPPEN(i >= ARRAY_SIZE(dirindex)
|| dirindex[i] < 0))
return DIR_STOP;
return dirindex[i];
* which do not accept partial moves.
*/
char *
-getpath(char *buf, char *arg, coord x, coord y, int onlyown,
- int showdes, enum p_mode destinations)
+getpath(char *buf, char *arg, coord x, coord y, int onlyown, int showdes,
+ int mobtype)
{
char buf2[1024];
char *p = buf;
char *bp;
+ size_t len;
char prompt[128];
coord dx, dy;
struct sctstr sect;
}
getsect(x, y, §);
- nx = x;
- ny = y;
- more:
+more:
while (*p) {
if (sarg_xy(p, &dx, &dy)) {
- bp = NULL;
- switch (destinations) {
- case P_NONE:
- pr("Destination sectors not allowed here!\n");
- break;
- case P_FLYING:
- bp = BestAirPath(buf2, nx, ny, dx, dy);
- break;
- case P_SAILING:
- bp = BestShipPath(buf2, nx, ny, dx, dy, player->cnum);
+ if (path_find(x, y, dx, dy, player->cnum, mobtype) < 0) {
+ pr("Can't get to %s from here!\n",
+ xyas(dx, dy, player->cnum));
break;
}
- if (bp && p + strlen(bp) + 1 < buf + MAX_PATH_LEN) {
- strcpy(p, bp);
- pr("Using best path '%s'\n", p);
- pr("Using total path '%s'\n", buf);
- return buf;
- } else {
- pr("Can't get to %s from here!\n",
+ len = path_find_route(p, buf + MAX_PATH_LEN - p, x, y, dx, dy);
+ if (p + len >= buf + MAX_PATH_LEN) {
+ pr("Can't handle path to %s, it's too long, sorry.\n",
xyas(dx, dy, player->cnum));
+ break;
}
- break;
+ pr("Using best path '%s'\n", p);
+ pr("Using total path '%s'\n", buf);
+ return buf;
}
dir = chkdir(*p, DIR_STOP, DIR_LAST);
if (dir < 0) {
break;
}
if (dir == DIR_STOP) {
- p[1] = 0;
+ *p = 0;
return buf;
}
++p;
- x = nx;
- y = ny;
+ x = sect.sct_x;
+ y = sect.sct_y;
}
fly_map(x, y);
if (showdes) {
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;
- return buf;
+ return buf[0] ? buf : NULL;
}
/*
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);
}
projects / empserver / blobdiff