make some mextra guard macros available

 Changes to be committed:
	modified:   doc/fixes36.1
	modified:   include/mextra.h

diff --git a/doc/fixes36.1 b/doc/fixes36.1
index e7584feb4b4e894d8d497b62901ec00e07e94f5b..cc6cf57a70edc068ce7d5ebc2dafe291b9c46696 100644 (file)
--- 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 e2cde882cda77c841370af1ea68d495bbc7b0565..8a37a748340bffbc4e86d1a90fa81b912db5f6b1 100644 (file)
--- 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 */