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

fix broken migrating monster arrival

Browse Source 
If the first monster on the migrating_mons list couldn't arrive and
was put back on the list to try again later, 'later' would happen
immediately and the program looped forever trying and failing to
bring that monster to the level.

Defer repeat attempts at migration until losedogs() has been through
the whole migrating_mons list.  mon_arrive() now populates a new
list called failed_arrivals and losedog() moves its contents, if any,
to migrating_mons prior to returning.
This commit is contained in:
PatR
2022-07-28 00:51:18 -07:00
parent 1a367c7ff5
commit e13e514556
5 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vault.c
View File

@@ -215,10 +215,12 @@ findgd(void)
for (mprev = &g.migrating_mons; (mtmp = *mprev) != 0;
mprev = &mtmp->nmon) {
if (mtmp->isgd && on_level(&EGD(mtmp)->gdlevel, &u.uz)) {
/* take out of migrating_mons and place at <0,0> */
/* take out of migrating_mons and place at <0,0>;
simplified mon_arrive(); avoid that because it would
send mtmp into limbo if no regular map spot is available */
*mprev = mtmp->nmon;
/* simplified mon_arrive(); avoid that because it would send
mtmp into limbo if no regular map spot is available */
mtmp->nmon = fmon;
fmon = mtmp;
mon_track_clear(mtmp);
mtmp->mux = u.ux, mtmp->muy = u.uy;
mtmp->mx = mtmp->my = 0; /* not on map (note: mx is already 0) */