From: nethack.rankin <nethack.rankin>
Date: Thu, 2 Feb 2012 09:18:14 +0000 (+0000)
Subject: quest pager fix (trunk only)
X-Git-Tag: MOVE2GIT~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88b88e2ca5cc974e1f77628d4dcf586b66e84ebe;p=nethack

quest pager fix (trunk only)

     A priest quest message that was supposed to say "brotherhood" or
"sisterhood" said "itood" instead.  Text "%shood" used the post-3.4.3 'h'
modifier to substitute a pronoun in place of the %s value.  That's only
a valid modifier when it follows %d (deity), %l (leader), %n (nemesis),
or %o (artifact).  Change the substitution routine to leave it as an 'h'
when it follows anything else.  [No fixes entry needed.]
---

diff --git a/src/questpgr.c b/src/questpgr.c
index 4cec92682..af7489b90 100644
--- a/src/questpgr.c
+++ b/src/questpgr.c
@@ -374,7 +374,10 @@ convert_line()
 				case 'i':	/* him/her */
 				case 'I':
 				case 'j':	/* his/her */
-				case 'J': qtext_pronoun(*(c - 1), *c);
+				case 'J': if (index("dlno", lowc(*(c - 1))))
+					      qtext_pronoun(*(c - 1), *c);
+					  else
+					      --c;	/* default action */
 				    break;
 
 					/* pluralize */