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

fix #Q211 - inappropriate vault feedback

Browse Source 
From a bug report, you'd get the message
"the corridor disappears" whenever a vault guard was killed, even if the
temporary vault corridor was already gone due to leaving its vicinity.  This
fix seems to work ok, but I don't pretend to understand how the convoluted
vault code actually works.
This commit is contained in:
nethack.rankin
2005-10-29 04:07:21 +00:00
parent 1f5c035b3b
commit 0defd00b4b
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes34.4
+1
View File
@@ -151,6 +151,7 @@ some messages which referred to "mirror" ought to have used "looking glass"
incubi react to mirrors incubi react to mirrors
alignment of Angels was handled inconsistently alignment of Angels was handled inconsistently
pets capable of digging could pass through walls and stone on the Rogue level pets capable of digging could pass through walls and stone on the Rogue level
avoid inappropriate "the corridor disappears" when vault guard gets killed
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
src/vault.c
+16 -12
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)vault.c 3.5 2003/01/15 */ /* SCCS Id: @(#)vault.c 3.5 2005/10/28 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -18,19 +18,21 @@ STATIC_DCL void FDECL(wallify_vault,(struct monst *));
STATIC_OVL boolean STATIC_OVL boolean
clear_fcorr(grd, forceshow) clear_fcorr(grd, forceshow)
register struct monst *grd; struct monst *grd;
register boolean forceshow; boolean forceshow;
{ {
register int fcx, fcy, fcbeg; register int fcx, fcy, fcbeg;
register struct monst *mtmp; struct monst *mtmp;
boolean sawcorridor = FALSE;
struct egd *egrd = EGD(grd);
if (!on_level(&(EGD(grd)->gdlevel), &u.uz)) return TRUE; if (!on_level(&egrd->gdlevel, &u.uz)) return TRUE;
while((fcbeg = EGD(grd)->fcbeg) < EGD(grd)->fcend) { while ((fcbeg = egrd->fcbeg) < egrd->fcend) {
fcx = EGD(grd)->fakecorr[fcbeg].fx; fcx = egrd->fakecorr[fcbeg].fx;
fcy = EGD(grd)->fakecorr[fcbeg].fy; fcy = egrd->fakecorr[fcbeg].fy;
if((grd->mhp <= 0 || !in_fcorridor(grd, u.ux, u.uy)) && if((grd->mhp <= 0 || !in_fcorridor(grd, u.ux, u.uy)) &&
EGD(grd)->gddone) egrd->gddone)
forceshow = TRUE; forceshow = TRUE;
if((u.ux == fcx && u.uy == fcy && grd->mhp > 0) if((u.ux == fcx && u.uy == fcy && grd->mhp > 0)
|| (!forceshow && couldsee(fcx,fcy)) || (!forceshow && couldsee(fcx,fcy))
@@ -45,12 +47,14 @@ register boolean forceshow;
(void) rloc(mtmp, FALSE); (void) rloc(mtmp, FALSE);
} }
} }
levl[fcx][fcy].typ = EGD(grd)->fakecorr[fcbeg].ftyp; if (levl[fcx][fcy].typ == CORR && cansee(fcx, fcy))
sawcorridor = TRUE;
levl[fcx][fcy].typ = egrd->fakecorr[fcbeg].ftyp;
map_location(fcx, fcy, 1); /* bypass vision */ map_location(fcx, fcy, 1); /* bypass vision */
if(!ACCESSIBLE(levl[fcx][fcy].typ)) block_point(fcx,fcy); if(!ACCESSIBLE(levl[fcx][fcy].typ)) block_point(fcx,fcy);
EGD(grd)->fcbeg++; egrd->fcbeg++;
} }
if(grd->mhp <= 0) { if (sawcorridor) {
pline_The("corridor disappears."); pline_The("corridor disappears.");
if(IS_ROCK(levl[u.ux][u.uy].typ)) You("are encased in rock."); if(IS_ROCK(levl[u.ux][u.uy].typ)) You("are encased in rock.");
} }