nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

fire_damage() vs containers

Browse Source 
Containers can't become fireproofed so the line of code in
fire_damage() which tested for that led to confusion.

Also, add missing handling for statues as containers.
This commit is contained in:
PatR
2024-06-08 15:22:08 -07:00
parent 304f18ae16
commit 6718a8af1f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trap.c
+8 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 trap.c $NHDT-Date: 1708283914 2024/02/18 19:18:34 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.577 $ */ /* NetHack 3.7 trap.c $NHDT-Date: 1717884802 2024/06/08 22:13:22 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.598 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -4277,8 +4277,9 @@ fire_damage(
if (catch_lit(obj)) if (catch_lit(obj))
return FALSE; return FALSE;
if (Is_container(obj)) { if (Is_container(obj) || obj->otyp == STATUE) {
switch (obj->otyp) { switch (obj->otyp) {
case STATUE:
case ICE_BOX: case ICE_BOX:
return FALSE; /* Immune */ return FALSE; /* Immune */
case CHEST: case CHEST:
@@ -4292,8 +4293,12 @@ fire_damage(
break; break;
} }
if ((!force && (Luck + 5) > rn2(chance)) if ((!force && (Luck + 5) > rn2(chance))
|| (is_flammable(obj) && obj->oerodeproof)) /* note: containers aren't subject to erosion so are never
marked fireproof/corrodeproof/&c */
/*|| (is_flammable(obj) && obj->oerodeproof)*/
) {
return FALSE; return FALSE;
}
/* Container is burnt up - dump contents out */ /* Container is burnt up - dump contents out */
if (in_sight) if (in_sight)
pline("%s catches fire and burns.", Yname2(obj)); pline("%s catches fire and burns.", Yname2(obj));