From c4d45d69605a79b108dc347c34bda531938414a7 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sun, 3 Jan 2016 10:48:47 -0500 Subject: [PATCH] make some mextra guard macros available Changes to be committed: modified: doc/fixes36.1 modified: include/mextra.h --- doc/fixes36.1 | 1 + include/mextra.h | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/fixes36.1 b/doc/fixes36.1 index e7584feb4..cc6cf57a7 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -80,6 +80,7 @@ when a pet moves reluctantly, name the top item of the pile it is reluctant ensure sufficient messages are given to clarify the transition from detected vampire bats to fog clouds in Vlad's tower fix "killing by kicking something weird" when kicking an object causes death +guard macros available for mextra fields similar to those for oextra fields Platform- and/or Interface-Specific Fixes diff --git a/include/mextra.h b/include/mextra.h index e2cde882c..8a37a7483 100644 --- a/include/mextra.h +++ b/include/mextra.h @@ -1,4 +1,4 @@ -/* NetHack 3.6 mextra.h $NHDT-Date: 1432512781 2015/05/25 00:13:01 $ $NHDT-Branch: master $:$NHDT-Revision: 1.16 $ */ +/* NetHack 3.6 mextra.h $NHDT-Date: 1451836000 2016/01/03 15:46:40 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.18 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -190,6 +190,11 @@ struct mextra { #define MCORPSENM(mon) ((mon)->mextra->mcorpsenm) #define has_mname(mon) ((mon)->mextra && MNAME(mon)) +#define has_egd(mon) ((mon)->mextra && EGD(mon)) +#define has_epri(mon) ((mon)->mextra && EPRI(mon)) +#define has_eshk(mon) ((mon)->mextra && ESHK(mon)) +#define has_emin(mon) ((mon)->mextra && EMIN(mon)) +#define has_edog(mon) ((mon)->mextra && EDOG(mon)) #define has_mcorpsenm(mon) ((mon)->mextra && MCORPSENM(mon) != NON_PM) #endif /* MEXTRA_H */