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

(diridx): New. Use instead of chkdir() where direction characters

Browse source 
must be valid.  Oopses on bad direction characters.
(pathtoxy, ac_encounter): Bad direction characters used to lead to bad
array subscript and potential disaster.
(pathrange, path): Stop on DIR_STOP as well as on bad direction
characters.  This is just for consistency with other code; DIR_STOP
should occur only last in a path here.
(sail_nav_fleet, nav_ship): No change except for the oops.
This commit is contained in:
Markus Armbruster 2005-09-25 09:49:36 +00:00
parent a88f12017e
commit dfa56cb0ef
6 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,6 +66,21 @@ direrr(s_char *stop_msg, s_char *view_msg, s_char *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.
*/
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
@ -213,19 +228,15 @@ pathtoxy(s_char *path, coord *xp, coord *yp,
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);
@ -236,8 +247,7 @@ pathtoxy(s_char *path, coord *xp, coord *yp,
}
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;
@ -247,8 +257,10 @@ pathrange(register coord cx, register coord cy, register s_char *pp,
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)