/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, 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
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
*
*/
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "path.h"
-#include "nat.h"
-#include "sect.h"
+#include <config.h>
+
#include "file.h"
+#include "optlist.h"
+#include "path.h"
+#include "player.h"
#include "prototypes.h"
+#include "sect.h"
int
-chkdir(s_char dir_char, int min_dir, int max_dir)
+chkdir(char dir_char, int min_dir, int max_dir)
{
- register int i;
+ int i;
for (i = min_dir; i <= max_dir; i++)
if (dir_char == dirch[i])
}
void
-direrr(s_char *stop_msg, s_char *view_msg, s_char *map_msg)
+direrr(char *stop_msg, char *view_msg, char *map_msg)
{
pr("Legal directions are:\n");
pr(" %c %c\n", dirch[DIR_UL], dirch[DIR_UR]);
*/
char *
getpath(char *buf, char *arg, coord x, coord y, int onlyown,
- int showdes, int destinations)
+ int showdes, enum p_mode destinations)
{
+ char buf2[1024];
char *p = buf;
char *bp;
char prompt[128];
coord dx, dy;
- struct sctstr sect, dsect;
+ struct sctstr sect;
coord nx, ny;
int dir;
- double mv_cost;
if (arg) {
strncpy(buf, arg, MAX_PATH_LEN - 1);
more:
while (*p) {
if (sarg_xy(p, &dx, &dy)) {
- bp = 0;
- if (destinations == P_NONE) {
+ bp = NULL;
+ switch (destinations) {
+ case P_NONE:
pr("Destination sectors not allowed here!\n");
- *p = 0;
+ break;
+ case P_FLYING:
+ bp = BestAirPath(buf2, nx, ny, dx, dy);
+ break;
+ case P_SAILING:
+ bp = BestShipPath(buf2, nx, ny, dx, dy, player->cnum);
+ break;
}
- if (getsect(dx, dy, &dsect)) {
- if (destinations == P_WALKING) {
- bp = BestLandPath(p, §, &dsect,
- &mv_cost, MOB_ROAD);
- } else if (destinations == P_FLYING) {
- bp = BestAirPath(p, nx, ny, dx, dy);
- }
- } else {
- pr("Invalid destination sector!\n");
- *p = 0;
- }
- if (bp) {
+ 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",
- xyas(nx, ny, player->cnum));
- *p = 0;
+ xyas(dx, dy, player->cnum));
}
break;
}
if (dir < 0) {
pr("\"%c\" is not legal...", *p);
direrr("'%c' to stop\n", NULL, NULL);
- *p = 0;
break;
}
nx = x + diroff[dir][0];
ny = y + diroff[dir][1];
getsect(nx, ny, §);
if (onlyown && sect.sct_own != player->cnum) {
- *p = 0;
pr("You don't own %s; you can't go there!\n",
xyas(nx, ny, player->cnum));
break;
}
- if (dir == DIR_STOP || dir == DIR_MAP) {
+ if (dir == DIR_STOP) {
p[1] = 0;
return buf;
}
- if (++p - buf == MAX_PATH_LEN) {
- pr("Path length may not exceed %d.\n", MAX_PATH_LEN);
- pr("Aborting...\n");
- *buf = 0;
- return buf;
- }
+ ++p;
x = nx;
y = ny;
}
sprintf(prompt, "<%d: %s> ", (int)(p - buf),
xyas(x, y, player->cnum));
}
- if (!(bp = getstring(prompt, p)) || !*bp) {
- if (player->aborted)
- *buf = 0;
- return buf;
+ bp = getstring(prompt, buf2);
+ 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;
}
- goto more;
+ strcpy(p, bp);
+ if (*bp)
+ goto more;
+ return buf;
}
/*
* movement cost it takes to get there.
*/
double
-pathtoxy(s_char *path, coord *xp, coord *yp,
- double (*cost) (struct sctstr *, natid))
+pathtoxy(char *path, coord *xp, coord *yp,
+ double (*cost)(struct sctstr *, natid))
{
struct sctstr s;
- s_char *pp;
+ char *pp;
coord x;
coord y;
int val;
}
void
-pathrange(coord cx, coord cy, s_char *pp, int border, struct range *range)
+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 = ynorm(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