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

vault guard bug: dropping minvent at <0,0> (trunk only)

Browse Source 
From the newsgroup:  after killing a vault guard on a level where
every object had been removed or was held by the hero, object detection
gave feedback about finding something but was unable to show anything.
It was finding the dead guard's inventory at <0,0>, a part of the map
which never gets shown.  A dying guard is sent to that location instead
of being killed and deleted, because the data for his temporary corridor
to/from the vault is kept in the egd structure attached to him.  That's
somewhat obscure but works; dying guards just need to drop inventory
before being transfered there rather than after.

     Depending upon how they're killed, it's possible that the umpteen
places in the code that loop over fmon might have been processing them
as if still in play.  This sets their mhp to 0 so such loops will ignore
them, and teaches dmonsfree() not to release them.  Once the temporary
corridor has been removed, their isgd flag is cleared and they become
ordinary dead monsters and get deleted from the fmon list the next time
it's purged.

     This also lets you throw gold to/at the guard when he tells you to
drop it.  He already would catch it, but now he won't treat the throw as
an attack.  Any gold he carries will eventually disappear when he does,
so dropping it remains a better option for the player.
This commit is contained in:
nethack.rankin
2011-10-09 02:13:01 +00:00
parent 23cace2251
commit bd172eb167
5 changed files with 88 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/vault.c
View File

@@ -92,7 +92,10 @@ restfakecorr(grd)
register struct monst *grd;
{
/* it seems you left the corridor - let the guard disappear */
if(clear_fcorr(grd, FALSE)) mongone(grd);
if (clear_fcorr(grd, FALSE)) {
grd->isgd = 0; /* dmonsfree() should delete this mon */
mongone(grd);
}
}
boolean
@@ -101,7 +104,11 @@ register struct monst *grd;
{
register boolean dispose = clear_fcorr(grd, TRUE);
if(!dispose) {
if (!dispose) {
/* destroy guard's gold; drop any other inventory */
relobj(grd, 0, FALSE);
/* guard is dead; monster traversal loops should skip it */
grd->mhp = 0;
/* see comment by newpos in gd_move() */
remove_monster(grd->mx, grd->my);
newsym(grd->mx, grd->my);
@@ -110,7 +117,8 @@ register struct monst *grd;
EGD(grd)->ogy = grd->my;
dispose = clear_fcorr(grd, TRUE);
}
return(dispose);
if (dispose) grd->isgd = 0; /* for dmonsfree() */
return dispose;
}
STATIC_OVL boolean
@@ -175,9 +183,8 @@ invault()
char buf[BUFSZ];
register int x, y, dd, gx, gy;
int lx = 0, ly = 0;
#ifdef GOLDOBJ
long umoney;
#endif
long umoney;
/* first find the goal for the guard */
for(dd = 2; (dd < ROWNO || dd < COLNO); dd++) {
for(y = u.uy-dd; y <= u.uy+dd; ly = y, y++) {
@@ -331,29 +338,20 @@ fnd:
}
verbalize("I don't know you.");
#ifndef GOLDOBJ
if (Deaf)
umoney = u.ugold;
#else
umoney = money_cnt(invent);
#endif
if (Deaf) {
;
else if (!u.ugold && !hidden_gold())
} else if (!umoney && !hidden_gold()) {
verbalize("Please follow me.");
else {
if (!u.ugold)
} else {
if (!umoney)
verbalize("You have hidden gold.");
verbalize("Most likely all your gold was stolen from this vault.");
verbalize("Please drop that gold and follow me.");
}
#else
umoney = money_cnt(invent);
if (Deaf)
;
else if (!umoney && !hidden_gold())
verbalize("Please follow me.");
else {
if (!umoney)
verbalize("You have hidden money.");
verbalize("Most likely all your money was stolen from this vault.");
verbalize("Please drop that money and follow me.");
}
#endif
EGD(guard)->gdx = gx;
EGD(guard)->gdy = gy;
EGD(guard)->fcbeg = 0;