/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2006, 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 <config.h>
+
#include "misc.h"
#include "player.h"
#include "xy.h"
#include "file.h"
#include "prototypes.h"
-int
-getdir(s_char *prompt, s_char *stop_msg, s_char *view_msg,
- s_char *bomb_msg)
-{
- register int max_dir;
- register int min_dir;
- register int dir_num;
- s_char buf[1024];
-
- if (stop_msg != 0)
- min_dir = DIR_STOP;
- else
- min_dir = DIR_FIRST;
- if (view_msg == 0)
- max_dir = DIR_LAST;
- else
- max_dir = DIR_VIEW;
- while (1) {
- if (getstring(prompt, buf) == 0 || *buf == 0)
- return -1;
- dir_num = chkdir(buf[0], min_dir, max_dir);
- if (dir_num >= min_dir)
- break;
- direrr(stop_msg, view_msg, bomb_msg);
- }
- return dir_num;
-}
-
int
chkdir(s_char dir_char, int min_dir, int max_dir)
{
pr(map_msg, dirch[DIR_MAP]);
}
+/*
+ * 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)
+ || dirindex[i] < 0))
+ return DIR_STOP;
+ return dirindex[i];
+}
+
/*
* return pointer to path; prompt user until a stop char
* or a bomb char have been entered. A "bomb" char in
* move commands, and isn't valid for those commands
* which do not accept partial moves.
*/
-s_char *
-getpath(s_char *buf, s_char *arg, coord x, coord y, int onlyown,
- int showdes, int showxy, int destinations)
+char *
+getpath(char *buf, char *arg, coord x, coord y, int onlyown,
+ int showdes, int destinations)
{
- s_char *p = buf;
- s_char *bp;
- s_char prompt[128];
+ char buf2[1024];
+ char *p = buf;
+ char *bp;
+ char prompt[128];
coord dx, dy;
struct sctstr sect, dsect;
coord nx, ny;
int dir;
- s_char *execute;
double mv_cost;
if (arg) {
*p = 0;
}
- if (showxy)
- execute = " & '%c' to execute\n";
- else
- execute = "\n";
-
getsect(x, y, §);
nx = x;
ny = y;
more:
while (*p) {
if (sarg_xy(p, &dx, &dy)) {
- bp = 0;
+ bp = NULL;
if (destinations == P_NONE) {
pr("Destination sectors not allowed here!\n");
- *p = 0;
}
if (getsect(dx, dy, &dsect)) {
if (destinations == P_WALKING) {
- bp = BestLandPath(p, §, &dsect,
+ bp = BestLandPath(buf2, §, &dsect,
&mv_cost, MOB_ROAD);
} else if (destinations == P_FLYING) {
- bp = BestAirPath(p, nx, ny, dx, dy);
+ bp = BestAirPath(buf2, 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;
}
dir = chkdir(*p, DIR_STOP, DIR_LAST);
if (dir < 0) {
pr("\"%c\" is not legal...", *p);
- direrr("'%c' to stop", (s_char *)0, execute);
- *p = 0;
+ direrr("'%c' to stop\n", NULL, NULL);
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;
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 && 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;
+ if (!bp)
+ return NULL;
+ strcpy(p, bp);
+ if (*bp)
+ goto more;
+ return buf;
}
/*
coord y;
int val;
double m;
- int c;
x = *xp;
y = *yp;
m = 0.0;
for (pp = path; *pp; pp++) {
- if ((val = chkdir(*pp, DIR_STOP, DIR_LAST)) == 0)
+ if ((val = diridx(*pp)) == DIR_STOP)
break;
x += diroff[val][0];
y += diroff[val][1];
- c = dirch[val];
- if (c == DIR_STOP)
- break;
if (!getsect(x, y, &s))
return -1.0;
m += cost(&s, s.sct_own);
return m;
}
-/*
- * return true if "who" owns the path starting at x,y
- */
-int
-chkpath(natid who, s_char *path, coord x, coord y)
-{
- s_char *pp;
- int val;
- struct sctstr sect;
-
- for (pp = path; *pp; pp++) {
- if ((val = chkdir(*pp, DIR_STOP, DIR_LAST)) == 0)
- break;
- x += diroff[val][0];
- y += diroff[val][1];
- if (!getsect(x, y, §) || sect.sct_own != who)
- return 0;
- }
- return 1;
-}
-
void
-pathrange(register coord cx, register coord cy, register s_char *pp,
- int border, struct range *range)
+pathrange(coord cx, coord cy, s_char *pp, int border, struct range *range)
{
int dir;
range->hy = cy;
range->width = 0;
range->height = 0;
- while ((dir = chkdir(*pp, DIR_FIRST, DIR_LAST)) >= 0) {
- pp++;
+ for (; *pp; pp++) {
+ dir = diridx(*pp);
+ if (dir == DIR_STOP)
+ break;
cx += diroff[dir][0];
cy += diroff[dir][1];
if (cx < range->lx)
projects / empserver / blobdiff