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

More untrap message clean-up

Browse Source
This commit is contained in:
nethack.allison
2002-07-20 02:07:09 +00:00
parent 8a9c09a8b1
commit cdec686d09
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/trap.c
View File

@@ -3171,15 +3171,24 @@ boolean force;
deal_with_floor_trap = TRUE;
Strcpy(the_trap, the(defsyms[trap_to_defsym(ttmp->ttyp)].explanation));
if (box_here) {
Sprintf(qbuf, "There %s and %s here. %s %s?",
if (ttmp->ttyp == PIT || ttmp->ttyp == SPIKED_PIT) {
You_cant("do much about %s%s.",
the_trap, u.utrap ?
" that you're stuck in" :
" while standing on the edge of it");
trap_skipped = TRUE;
deal_with_floor_trap = FALSE;
} else {
Sprintf(qbuf, "There %s and %s here. %s %s?",
(containercnt == 1) ? "is a container" : "are containers",
an(defsyms[trap_to_defsym(ttmp->ttyp)].explanation),
ttmp->ttyp == WEB ? "Remove" : "Disarm", the_trap);
switch (ynq(qbuf)) {
case 'q': return(0);
case 'n': trap_skipped = TRUE;
deal_with_floor_trap = FALSE;
break;
switch (ynq(qbuf)) {
case 'q': return(0);
case 'n': trap_skipped = TRUE;
deal_with_floor_trap = FALSE;
break;
}
}
}
if (deal_with_floor_trap) {
@@ -3221,9 +3230,8 @@ boolean force;
if(!u.dx && !u.dy) {
for(otmp = level.objects[x][y]; otmp; otmp = otmp->nexthere)
if(Is_box(otmp)) {
There("is %s here.", doname(otmp));
switch (ynq("Check for traps?")) {
Sprintf(qbuf, "There is %s here. Check it for traps?", doname(otmp));
switch (ynq(qbuf)) {
case 'q': return(0);
case 'n': continue;
}