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

(bestownedpath): Fix for impassable end sector. Broken in rev. 1.23.

Browse source
This commit is contained in:
Markus Armbruster 2006-06-18 09:00:58 +00:00
parent bd51dea51a
commit 3eef93d97b
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/common/bestpath.c
View file

@ -114,6 +114,8 @@ bestownedpath(char *bpath, char *bigmap,
if (!valid(x, y) || !valid(ex, ey)) if (!valid(x, y) || !valid(ex, ey))
return NULL; return NULL;
if (!owned_and_navigable(bigmap, ex, ey, own))
return NULL;
for (i = 0; i < WORLD_X; i++) for (i = 0; i < WORLD_X; i++)
for (j = 0; j < WORLD_Y; j++) for (j = 0; j < WORLD_Y; j++)
@ -145,6 +147,8 @@ bestownedpath(char *bpath, char *bigmap,
ty = YNORM(ty); ty = YNORM(ty);
if (mapindex[tx][ty] == 0xFFFF) { if (mapindex[tx][ty] == 0xFFFF) {
if (owned_and_navigable(bigmap, tx, ty, own)) { if (owned_and_navigable(bigmap, tx, ty, own)) {
if (CANT_HAPPEN(i < DIR_FIRST || i > DIR_LAST))
i = DIR_STOP;
mapindex[tx][ty] = mapindex[tx][ty] =
((i - DIR_FIRST + 1) << 13) + routelen; ((i - DIR_FIRST + 1) << 13) + routelen;
markedsectors++; markedsectors++;