nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Fix shopkeeper Kop summons causing segfault

Browse Source 
... if it happened on a level with no downstairs, such as the tourist quest.
This commit is contained in:
Pasi Kallinen
2022-01-11 22:55:40 +02:00
parent a8e9e1b488
commit 1f2d16082e
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/shk.c
View File

@@ -344,14 +344,9 @@ call_kops(register struct monst* shkp, register boolean nearshop)
{
coord mm;
stairway *stway = g.stairs;
xchar sx = 0, sy = 0;
while (stway) {
if (!stway->isladder && !stway->up
&& stway->tolev.dnum == u.uz.dnum)
break;
stway = stway->next;
}
choose_stairs(&sx, &sy, TRUE);
if (nearshop) {
/* Create swarm around you, if you merely "stepped out" */
@@ -365,9 +360,11 @@ call_kops(register struct monst* shkp, register boolean nearshop)
if (flags.verbose)
pline_The("Keystone Kops are after you!");
/* Create swarm near down staircase (hinders return to level) */
mm.x = stway->sx;
mm.y = stway->sy;
makekops(&mm);
if (isok(sx, sy)) {
mm.x = sx;
mm.y = sy;
makekops(&mm);
}
/* Create swarm near shopkeeper (hinders return to shop) */
mm.x = shkp->mx;
mm.y = shkp->my;