diff --git a/src/vault.c b/src/vault.c index 9335c4ac6..31002f65f 100644 --- a/src/vault.c +++ b/src/vault.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 vault.c $NHDT-Date: 1657868307 2022/07/15 06:58:27 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.91 $ */ +/* NetHack 3.7 vault.c $NHDT-Date: 1737622664 2025/01/23 00:57:44 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.113 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */ /* NetHack may be freely redistributed. See license for details. */ @@ -888,7 +888,7 @@ gd_move(struct monst *grd) if (!on_level(&(egrd->gdlevel), &u.uz)) return -1; - nx = ny = m = n = 0; + if (semi_dead || !grd->mx || egrd->gddone) { egrd->gddone = 1; return gd_move_cleanup(grd, semi_dead, FALSE); @@ -1033,6 +1033,7 @@ gd_move(struct monst *grd) } } } + m = n = 0; for (fci = egrd->fcbeg; fci < egrd->fcend; fci++) if (g_at(egrd->fakecorr[fci].fx, egrd->fakecorr[fci].fy)) { m = egrd->fakecorr[fci].fx; diff --git a/src/version.c b/src/version.c index 34085a8af..e6b675ed3 100644 --- a/src/version.c +++ b/src/version.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 version.c $NHDT-Date: 1655402415 2022/06/16 18:00:15 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.92 $ */ +/* NetHack 3.7 version.c $NHDT-Date: 1737622664 2025/01/23 00:57:44 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.105 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2018. */ /* NetHack may be freely redistributed. See license for details. */ @@ -416,6 +416,8 @@ uptodate(NHFILE *nhfp, const char *name, unsigned long utdflags) if (nhfp->structlevel) { rlen = read(nhfp->fd, (genericptr_t) &indicator, sizeof indicator); + if (rlen != sizeof indicator) + return FALSE; rlen = read(nhfp->fd, (genericptr_t) &filecmc, sizeof filecmc); if (rlen == 0) return FALSE;