fireproof candles

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index c86d0829aa4c75cf3b0faa6a1d7c90d87db8c123..d198e358597c47772730d2da414140c180369b42 100644 (file)
--- 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 009ff1edddadeeb69c0969aff3724c78b6dacf0b..ceef4dc77b1f0205a18181207e9eb31ad8ef2ab1 100644 (file)
--- 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 2d297cf642ab89d58827f3dc976308b9cd8b4361..66ce21b9b27930699b7ddf0c4b486312c8edc60a 100644 (file)
--- 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;