imitation spelling (trunk only)

     I'm not a contender to win any spelling bees.  (Mimicker does't
seem to even be a real word; I'm not sure if it ought to end in "or"
instead of "er".  But changing it to "mime" would be too weird.)

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index d2e6efa776512d4c76c7317f358dfb479bc9f39e..8628384c293387b5e95e33f4b1f7db97ef488a37 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -395,7 +395,7 @@ using F to attack wall/boulder/statue while wielding pick digs/breaks target
 shapechangers shouldn't receive starting inventory of their initial shape
 streamline old ^X output and integrate it with enlightenment feedback;
        new ^X output includes expanded form of abbreviated bottom line info
-"killed by X" becomes "killed by a chameleon immitating X" when appropriate
+"killed by X" becomes "killed by a chameleon imitating X" when appropriate
 
 
 Platform- and/or Interface-Specific New Features

diff --git a/src/end.c b/src/end.c
index a7558d80ca0d39c99672e89e4c1a17a2b6fe920b..1427c77775c213cc16391429bd36883260e56a2f 100644 (file)
--- a/src/end.c
+++ b/src/end.c
@@ -199,7 +199,7 @@ int how;
                *champtr = (mtmp->cham >= LOW_PM) ? &mons[mtmp->cham] : mptr;
        boolean distorted = (boolean)(Hallucination && canspotmon(mtmp)),
                mimicker = (mtmp->m_ap_type == M_AP_MONSTER),
-               immitator = (mptr != champtr || mimicker);
+               imitator = (mptr != champtr || mimicker);
 
        You((how == STONING) ? "turn to stone..." : "die...");
        mark_synch();   /* flush buffered screen output */
@@ -208,7 +208,7 @@ int how;
        /* "killed by the high priest of Crom" is okay,
           "killed by the high priest" alone isn't */
        if ((mptr->geno & G_UNIQ) != 0 &&
-               !(immitator && !mimicker) &&
+               !(imitator && !mimicker) &&
                !(mptr == &mons[PM_HIGH_PRIEST] && !mtmp->ispriest)) {
            if (!type_is_pname(mptr))
                Strcat(buf, "the ");
@@ -224,7 +224,7 @@ int how;
        if (distorted)
                Strcat(buf, "hallucinogen-distorted ");
 
-       if (immitator) {
+       if (imitator) {
                char shape[BUFSZ];
                const char *realnm = champtr->mname, *fakenm = mptr->mname;
                boolean alt = is_vampshifter(mtmp);
@@ -252,7 +252,7 @@ int how;
                /* omit "called" to avoid excessive verbosity */
                Sprintf(eos(buf),
                        alt ? "%s in %s form" :
-                         mimicker ? "%s disguised as %s" : "%s immitating %s",
+                         mimicker ? "%s disguised as %s" : "%s imitating %s",
                        realnm, shape);
                mptr = mtmp->data;      /* reset for mimicker case */
        } else if (mptr == &mons[PM_GHOST]) {