B14019 - pyrolisk vs flaming sphere

A 3.4.0 report, currently only the mdamagem gaze case caused the strange
"on fire" message for flaming spheres, but other attacks seemed like they
might result in a similar message, so I updated the damageum and hitmu
cases as well.

diff --git a/src/mhitm.c b/src/mhitm.c
index 5bf713dc56b6f6aa6024bfe333f50dabfb8aff3b..057805e55277896f6d5be623fcbf6be9c9372f5c 100644 (file)
--- a/src/mhitm.c
+++ b/src/mhitm.c
@@ -689,6 +689,8 @@ mdamagem(magr, mdef, mattk)
                if (vis)
                    pline("%s is %s!", Monnam(mdef),
                          mdef->data == &mons[PM_WATER_ELEMENTAL] ? "boiling" :
+                         mdef->data == &mons[PM_FLAMING_SPHERE] ?
+                               "already on fire" :
                          mattk->aatyp == AT_HUGS ?
                                "being roasted" : "on fire");
                if (pd == &mons[PM_STRAW_GOLEM] ||

diff --git a/src/mhitu.c b/src/mhitu.c
index d5ba16d6bdd4bdfaf616b9d48a098e44011a4411..a7625d039ddcffea1c86ddced52ae6d3962d0cbc 100644 (file)
--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -917,6 +917,8 @@ hitmu(mtmp, mattk)
                    pline("You're %s!",
                          youmonst.data == &mons[PM_WATER_ELEMENTAL] ?
                                "boiling" :
+                         youmonst.data == &mons[PM_FLAMING_SPHERE] ?
+                               "already on fire" :
                          mattk->aatyp == AT_HUGS ? "being roasted" :
                          "on fire");
                    if (youmonst.data == &mons[PM_STRAW_GOLEM] ||

diff --git a/src/uhitm.c b/src/uhitm.c
index f0dd789d06aba3424315c15413547493a91be657..6f77100334f26ea158ad9668db03ab26b316f826 100644 (file)
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -1252,6 +1252,8 @@ register struct attack *mattk;
                if (!Blind)
                    pline("%s is %s!", Monnam(mdef),
                          mdef->data == &mons[PM_WATER_ELEMENTAL] ? "boiling" :
+                         mdef->data == &mons[PM_FLAMING_SPHERE] ?
+                               "already on fire" :
                          mattk->aatyp == AT_HUGS ?
                                "being roasted" : "on fire");
                if (pd == &mons[PM_STRAW_GOLEM] ||