]> granicus.if.org Git - nethack/commitdiff
grammar bit
authornethack.allison <nethack.allison>
Wed, 17 May 2006 20:15:46 +0000 (20:15 +0000)
committernethack.allison <nethack.allison>
Wed, 17 May 2006 20:15:46 +0000 (20:15 +0000)
<Someone> wrote:
> You find an anti-magic field.
> Where do you want to jump?  (For instructions type a ?)
> You pass right over _a_ anti-magic field.

doc/fixes34.4
src/dothrow.c

index 6f5fc6433847c1edf66a59f432f01e090f27be69..de88d0c09427260cf647036dbbc6f23dd96eeccb 100644 (file)
@@ -219,6 +219,7 @@ create_object() created lizard corpses without timers and troll corpses with
        their revive timers, then changed the corpsenm field
 when a potion of acid was dropped into water and exploded, nethack would
        continue to use already freed memory and later might panic or crash
+when jumping over an already seen trap, use an() to get appropriate grammar
 
 
 Platform- and/or Interface-Specific Fixes
index 489bfbe3ab95ac3e8dcf4001cf0d42315476a6c1..15e30d24ae530d65aeec8c7e5591096240ab918d 100644 (file)
@@ -561,9 +561,8 @@ hurtle_step(arg, x, y)
                return TRUE;
        } else {
                if (ttmp->tseen)
-                   You("pass right over %s %s.",
-                       (ttmp->ttyp == ARROW_TRAP) ? "an" : "a",
-                       defsyms[trap_to_defsym(ttmp->ttyp)].explanation);
+                   You("pass right over %s.",
+                       an(defsyms[trap_to_defsym(ttmp->ttyp)].explanation));
        }
     }
     if (--*range < 0)          /* make sure our range never goes negative */