new man/woman (polyself, inevitably...)

     Noticed when testing the [trunk] ^X fix:  polymorphing into human
form (not reverting to original form) reported "you feel like a new man"
when I resumed being a cavewomen.  Like with ^X, it used poly'd hero's
current monster gender instead of the about-to-be-restored role gender.
It's amazing that nobody seems to have ever noticed in all this time.

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index fde31027eb4ce9fd2394c05c564b54607efc153d..f68b797bbc2bb8a1bcca7b6df8102cf433690bd1 100644 (file)
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -398,6 +398,9 @@ some actions taken when blind would yield "Wait!  That's a monster!" (for a
        mimic posing as a door) but not display the unseen monster glyph
 #untrap toward known trap location containing concealed mimic would yield
        "{The mimic|It} {is in the way|isn't trapped}." but not reveal mimic
+when polymorphed into an opposite sex monster, if you then become a new
+       human while failing to polymorph into something else, you'd be told
+       "you feel like a new man" for female or "a new woman" for male  
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/polyself.c b/src/polyself.c
index 5e96f01aa77392c131ddf344c64c74348ab03f0a..9d2b6c1b34696723eebe3395dbeaf1686c7f086c 100644 (file)
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -260,7 +260,8 @@ dead: /* we come directly here if their experience level went to 0 or less */
        }
        newuhs(FALSE);
        polyman("feel like a new %s!",
-               (flags.female && urace.individual.f) ? urace.individual.f :
+               /* use saved gender we're about to revert to, not current */
+               (u.mfemale && urace.individual.f) ? urace.individual.f :
                (urace.individual.m) ? urace.individual.m : urace.noun);
        if (Slimed) {
                Your("body transforms, but there is still slime on you.");