From 01ce182b02b0c71472368eba0bdb80043192a172 Mon Sep 17 00:00:00 2001 From: cohrs Date: Sun, 24 Sep 2006 23:58:39 +0000 Subject: [PATCH] fireproof containers catching fire in lava Recently reported to the list, a fireproof container dropped in lava would catch fire and burn. Add the missing check; this looks an oversight when the idea of fireproof was added, since other fireproof objects get handled later in the cascading if(). --- doc/fixes34.4 | 1 + src/trap.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/fixes34.4 b/doc/fixes34.4 index 58335f4fc..381150816 100644 --- a/doc/fixes34.4 +++ b/doc/fixes34.4 @@ -260,6 +260,7 @@ fix region timeout detection, caused strange display of stinking cloud try to keep migrating monsters from escaping the wizard tower affected monsters should always respect "Elbereth" try harder to keep dragged chain between ball and hero +fireproof containers should not burn in lava Platform- and/or Interface-Specific Fixes diff --git a/src/trap.c b/src/trap.c index 8813f457c..c0c15de4a 100644 --- a/src/trap.c +++ b/src/trap.c @@ -2811,7 +2811,8 @@ xchar x, y; chance = 20; break; } - if (!force && (Luck + 5) > rn2(chance)) + if ((!force && (Luck + 5) > rn2(chance)) || + (is_flammable(obj) && obj->oerodeproof)) continue; /* Container is burnt up - dump contents out */ if (in_sight) pline("%s catches fire and burns.", Yname2(obj)); -- 2.40.0