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

is_damageable was always true

Browse Source 
<Someone> noticed that is_damageable used the address of is_rottable
instead of calling it.  Unfortunately, there doesn't seem to be a good
compiler warning to detect uses of function addresses as booleans.
This commit is contained in:
cohrs
2003-04-06 15:02:57 +00:00
parent 420981789e
commit b39599719e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes34.2
+1
View File
@@ -35,6 +35,7 @@ dropping from height or throwing a normal container may damage contents
some Magicbane messages treated "erinys" as plural some Magicbane messages treated "erinys" as plural
initialize artifacts before processing $WIZKIT initialize artifacts before processing $WIZKIT
clean up inconsistency between various places quaff is documented clean up inconsistency between various places quaff is documented
is_damageable was using is_rottable incorrectly
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
include/objclass.h
+1 -1
View File
@@ -75,7 +75,7 @@ struct objclass {
#define is_corrodeable(otmp) (objects[otmp->otyp].oc_material == COPPER || objects[otmp->otyp].oc_material == IRON) #define is_corrodeable(otmp) (objects[otmp->otyp].oc_material == COPPER || objects[otmp->otyp].oc_material == IRON)
#define is_damageable(otmp) (is_rustprone(otmp) || is_flammable(otmp) || \ #define is_damageable(otmp) (is_rustprone(otmp) || is_flammable(otmp) || \
is_rottable || is_corrodeable(otmp)) is_rottable(otmp) || is_corrodeable(otmp))
schar oc_subtyp; schar oc_subtyp;
#define oc_skill oc_subtyp /* Skills of weapons, spellbooks, tools, gems */ #define oc_skill oc_subtyp /* Skills of weapons, spellbooks, tools, gems */