empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(getpath): Parameter showxy makes no sense and is not used. Remove.

Browse source 
Get rid of s_char.  Callers changed.
This commit is contained in:
Markus Armbruster 2005-09-25 17:00:50 +00:00
parent 21a39fd9dd
commit 269913baee
8 changed files with 14 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/path.h
View file

@ -56,8 +56,7 @@ extern int diroff[][2];
extern s_char dirch[];
/* src/lib/subs/paths.c */
extern s_char *getpath(s_char *, s_char *, coord, coord, int, int,
int, int);
extern char *getpath(char *, char *, coord, coord, int, int, int);
extern double fcost(struct sctstr *, natid);
extern double ncost(struct sctstr *, natid);
extern double pathtoxy(s_char *, coord *, coord *,

2
src/lib/commands/bomb.c
View file

@ -128,7 +128,7 @@ bomb(void)
}
ax = x;
ay = y;
if (getpath(flightpath, player->argp[5], ax, ay, 0, 0, 0, P_FLYING) == 0
if (getpath(flightpath, player->argp[5], ax, ay, 0, 0, P_FLYING) == 0
|| *flightpath == 0)
return RET_SYN;
tx = ax;

2
src/lib/commands/drop.c
View file

@ -82,7 +82,7 @@ drop(void)
}
ax = x;
ay = y;
if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, 0, P_FLYING) == 0
if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, P_FLYING) == 0
|| *flightpath == 0)
return RET_SYN;
tx = ax;

2
src/lib/commands/fly.c
View file

@ -87,7 +87,7 @@ fly(void)
}
ax = x;
ay = y;
if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, 0, P_FLYING) == 0
if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, P_FLYING) == 0
|| *flightpath == 0)
return RET_SYN;
tx = ax;

2
src/lib/commands/para.c
View file

@ -87,7 +87,7 @@ para(void)
}
ax = x;
ay = y;
if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, 0, P_FLYING) == 0
if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, P_FLYING) == 0
|| *flightpath == 0)
return RET_SYN;
tx = ax;

2
src/lib/commands/reco.c
View file

@ -81,7 +81,7 @@ reco(void)
}
ax = x;
ay = y;
if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, 0, P_FLYING) == 0
if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, P_FLYING) == 0
|| *flightpath == 0)
return RET_SYN;
tx = ax;

2
src/lib/commands/sail.c
View file

@ -138,7 +138,7 @@ cmd_sail_ship(struct nstr_item *nstr)
pr("Ship #%d at %s\n", ship.shp_uid,
xyas(ship.shp_x, ship.shp_y, ship.shp_own));
cp = getpath(navpath, player->argp[2],
ship.shp_x, ship.shp_y, 0, 0, 0, P_SAILING);
ship.shp_x, ship.shp_y, 0, 0, P_SAILING);
if (!check_ship_ok(&ship))
continue;
if (!player->aborted) {

20
src/lib/subs/paths.c
View file

@ -88,18 +88,17 @@ diridx(char dir)
* 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 *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) {
@ -109,11 +108,6 @@ getpath(s_char *buf, s_char *arg, coord x, coord y, int onlyown,
*p = 0;
}
if (showxy)
execute = " & '%c' to execute\n";
else
execute = "\n";
getsect(x, y, &sect);
nx = x;
ny = y;
@ -151,7 +145,7 @@ getpath(s_char *buf, s_char *arg, coord x, coord y, int onlyown,
dir = chkdir(*p, DIR_STOP, DIR_LAST);
if (dir < 0) {
pr("\"%c\" is not legal...", *p);
direrr("'%c' to stop", (s_char *)0, execute);
direrr("'%c' to stop\n", NULL, NULL);
*p = 0;
break;
}