From: cohrs <cohrs>
Date: Tue, 10 Dec 2002 05:07:09 +0000 (+0000)
Subject: B14019 - pyrolisk vs flaming sphere
X-Git-Tag: MOVE2GIT~2312
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68cfa968dd40182d647c02d3d4cbdabafa9f9157;p=nethack

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 5bf713dc5..057805e55 100644
--- 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 d5ba16d6b..a7625d039 100644
--- 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 f0dd789d0..6f7710033 100644
--- 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] ||