cancelled nurse #chat

On May 17, 2005, <email deleted> wrote:
> Cancelled nurses shouldn't say "Relax, this won't
> hurt a bit."

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index 2bdfe73ca28985131312950595efa339d81a2390..80c9e06fbbe38af8679bf15897128335d1beef4c 100644 (file)
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -200,6 +200,7 @@ use "your kraken" instead of "a kraken" when searching reveals a tame
        hidden monster
 Magicbane should not produce "<something> are confused" message
 handle antholes more sensibly when ants aren't available
+cancelled nurses shouldn't say "Relax, this won't hurt a bit"
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/sounds.c b/src/sounds.c
index ba506674b819848aa4a5596b863b45f71b0e2cc9..ba78d2ec2be41fe345bbe00c10b8d70976b7f0ee 100644 (file)
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -420,7 +420,8 @@ domonnoise(mtmp)
 register struct monst *mtmp;
 {
     register const char *pline_msg = 0,        /* Monnam(mtmp) will be prepended */
-                       *verbl_msg = 0; /* verbalize() */
+                       *verbl_msg = 0, /* verbalize() */
+                       *verbl_msg_mcan = 0;    /* verbalize() if cancelled */
     struct permonst *ptr = mtmp->data;
     char verbuf[BUFSZ];
 
@@ -765,6 +766,7 @@ register struct monst *mtmp;
            pline_msg = "seems to mutter a cantrip.";
            break;
        case MS_NURSE:
+           verbl_msg_mcan = "I hate this job!";
            if (uwep && (uwep->oclass == WEAPON_CLASS || is_weptool(uwep)))
                verbl_msg = "Put that weapon away before you hurt someone!";
            else if (uarmc || uarm || uarmh || uarms || uarmg || uarmf)
@@ -810,6 +812,7 @@ register struct monst *mtmp;
     }
 
     if (pline_msg) pline("%s %s", Monnam(mtmp), pline_msg);
+    else if (mtmp->mcan && verbl_msg_mcan) verbalize(verbl_msg_mcan);
     else if (verbl_msg) verbalize(verbl_msg);
     return(1);
 }