From: nethack.allison <nethack.allison>
Date: Wed, 17 May 2006 20:15:46 +0000 (+0000)
Subject: grammar bit
X-Git-Tag: MOVE2GIT~1015
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6c608403b0e667b145b367d51f0ed8a66dfe074;p=nethack

grammar bit

<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.
---

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index 6f5fc6433..de88d0c09 100644
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -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
diff --git a/src/dothrow.c b/src/dothrow.c
index 489bfbe3a..15e30d24a 100644
--- a/src/dothrow.c
+++ b/src/dothrow.c
@@ -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 */