upgrade to 3.6.2

[jnethack/source.git] / include / you.h

diff --git a/include/you.h b/include/you.h
index 15fb5f9..ad178a2 100644 (file)
--- a/include/you.h
+++ b/include/you.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6 you.h   $NHDT-Date: 1450231172 2015/12/16 01:59:32 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.30 $ */
+/* NetHack 3.6 you.h   $NHDT-Date: 1547514642 2019/01/15 01:10:42 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.35 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2016. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -236,12 +236,18 @@ struct Gender {
                              increment to 3 if you allow neuter roles */
 
 extern const struct Gender genders[]; /* table of available genders */
+/* pronouns for the hero */
 #define uhe()      (genders[flags.female ? 1 : 0].he)
 #define uhim()     (genders[flags.female ? 1 : 0].him)
 #define uhis()     (genders[flags.female ? 1 : 0].his)
-#define mhe(mtmp)  (genders[pronoun_gender(mtmp)].he)
-#define mhim(mtmp) (genders[pronoun_gender(mtmp)].him)
-#define mhis(mtmp) (genders[pronoun_gender(mtmp)].his)
+/* corresponding pronouns for monsters; yields "it" when mtmp can't be seen */
+#define mhe(mtmp)  (genders[pronoun_gender(mtmp, FALSE)].he)
+#define mhim(mtmp) (genders[pronoun_gender(mtmp, FALSE)].him)
+#define mhis(mtmp) (genders[pronoun_gender(mtmp, FALSE)].his)
+/* override "it" if reason is lack of visibility rather than neuter species */
+#define noit_mhe(mtmp)  (genders[pronoun_gender(mtmp, TRUE)].he)
+#define noit_mhim(mtmp) (genders[pronoun_gender(mtmp, TRUE)].him)
+#define noit_mhis(mtmp) (genders[pronoun_gender(mtmp, TRUE)].his)
 
 /*** Unified structure specifying alignment information ***/
 struct Align {
@@ -256,12 +262,12 @@ struct Align {
 extern const struct Align aligns[]; /* table of available alignments */
 
 enum utraptypes {
-    TT_BEARTRAP = 0,
-    TT_PIT,
-    TT_WEB,
-    TT_LAVA,
-    TT_INFLOOR,
-    TT_BURIEDBALL
+    TT_BEARTRAP   = 0,
+    TT_PIT        = 1,
+    TT_WEB        = 2,
+    TT_LAVA       = 3,
+    TT_INFLOOR    = 4,
+    TT_BURIEDBALL = 5
 };
 
 /*** Information about the player ***/