]> granicus.if.org Git - nethack/commitdiff
quest pager fix (trunk only)
authornethack.rankin <nethack.rankin>
Thu, 2 Feb 2012 09:18:14 +0000 (09:18 +0000)
committernethack.rankin <nethack.rankin>
Thu, 2 Feb 2012 09:18:14 +0000 (09:18 +0000)
     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.]

src/questpgr.c

index 4cec92682e4818d4bb59b586387bf4170dfd29fd..af7489b906eb680a81774c634333d6e4d37fccec 100644 (file)
@@ -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 */