From: arromdee <arromdee>
Date: Thu, 9 Feb 2006 03:40:26 +0000 (+0000)
Subject: fireproof candles
X-Git-Tag: MOVE2GIT~1126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f493c251873884ebb9c0a06933626e36fed0277;p=nethack

fireproof candles
---

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index c86d0829a..d198e3585 100644
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -189,6 +189,7 @@ Orion and Norn should be giant sized
 Orion, Norn, Cyclops and Lord Surtur should be able to tear webs
 ensure monsters cannot teleport to or be created outside nonpassable bounds
 	of special levels
+candles should not be fireproof
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 009ff1edd..ceef4dc77 100644
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -119,6 +119,7 @@ polymorphed spellbooks may turn blank or be too faint to read
 avoid inappropriate message when using a cursed lamp while blind
 player polymorphed as a guardian naga spit the wrong kind of venom
 put #define for potion occupant chance and cursed wand zap chance in one place
+candles should not be fireproof
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/mkobj.c b/src/mkobj.c
index 2d297cf64..66ce21b9b 100644
--- a/src/mkobj.c
+++ b/src/mkobj.c
@@ -1165,6 +1165,13 @@ register struct obj *otmp;
 	int otyp = otmp->otyp;
 	int omat = objects[otyp].oc_material;
 
+	/* Candles can be burned, but they're not flammable in the sense that
+	 * they can't get fire damage and it makes no sense for them to be
+	 * fireproofed.
+	 */
+	if (Is_candle(otmp))
+		return FALSE;
+
 	if (objects[otyp].oc_oprop == FIRE_RES || otyp == WAN_FIRE)
 		return FALSE;