Merge remote-tracking branch 'origin/NetHack-3.6.0'
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* NetHack 3.6 decl.h $NHDT-Date: 1432512782 2015/05/25 00:13:02 $ $NHDT-Branch: master $:$NHDT-Revision: 1.76 $ */
|
||||
/* NetHack 3.6 decl.h $NHDT-Date: 1496531104 2017/06/03 23:05:04 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.82 $ */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -317,6 +317,7 @@ E const char *materialnm[];
|
||||
#define SUPPRESS_HALLUCINATION 0x04
|
||||
#define SUPPRESS_SADDLE 0x08
|
||||
#define EXACT_NAME 0x0F
|
||||
#define SUPPRESS_NAME 0x10
|
||||
|
||||
/* Vision */
|
||||
E NEARDATA boolean vision_full_recalc; /* TRUE if need vision recalc */
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* NetHack 3.6 extern.h $NHDT-Date: 1494107197 2017/05/06 21:46:37 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.587 $ */
|
||||
/* NetHack 3.6 extern.h $NHDT-Date: 1496959470 2017/06/08 22:04:30 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.591 $ */
|
||||
/* Copyright (c) Steve Creps, 1988. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -270,7 +270,9 @@ E void NDECL(warnreveal);
|
||||
E int FDECL(dosearch0, (int));
|
||||
E int NDECL(dosearch);
|
||||
E void NDECL(sokoban_detect);
|
||||
#ifdef DUMPLOG
|
||||
E void NDECL(dump_map);
|
||||
#endif
|
||||
E void FDECL(reveal_terrain, (int, int));
|
||||
|
||||
/* ### dig.c ### */
|
||||
@@ -402,6 +404,7 @@ E char *FDECL(mon_nam, (struct monst *));
|
||||
E char *FDECL(noit_mon_nam, (struct monst *));
|
||||
E char *FDECL(Monnam, (struct monst *));
|
||||
E char *FDECL(noit_Monnam, (struct monst *));
|
||||
E char *FDECL(noname_monnam, (struct monst *, int));
|
||||
E char *FDECL(m_monnam, (struct monst *));
|
||||
E char *FDECL(y_monnam, (struct monst *));
|
||||
E char *FDECL(Adjmonnam, (struct monst *, const char *));
|
||||
@@ -433,6 +436,7 @@ E void FDECL(off_msg, (struct obj *));
|
||||
E void FDECL(set_wear, (struct obj *));
|
||||
E boolean FDECL(donning, (struct obj *));
|
||||
E boolean FDECL(doffing, (struct obj *));
|
||||
E void FDECL(cancel_doff, (struct obj *, long));
|
||||
E void NDECL(cancel_don);
|
||||
E int FDECL(stop_donning, (struct obj *));
|
||||
E int NDECL(Armor_off);
|
||||
@@ -873,6 +877,7 @@ E boolean FDECL(onlyspace, (const char *));
|
||||
E char *FDECL(tabexpand, (char *));
|
||||
E char *FDECL(visctrl, (CHAR_P));
|
||||
E char *FDECL(strsubst, (char *, const char *, const char *));
|
||||
E int FDECL(strNsubst, (char *, const char *, const char *, int));
|
||||
E const char *FDECL(ordin, (int));
|
||||
E char *FDECL(sitoa, (int));
|
||||
E int FDECL(sgn, (int));
|
||||
|
||||
Reference in New Issue
Block a user