Merge remote-tracking branch 'origin/NetHack-3.6.0'
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* NetHack 3.6 extern.h $NHDT-Date: 1461967848 2016/04/29 22:10:48 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.558 $ */
|
||||
/* NetHack 3.6 extern.h $NHDT-Date: 1471112244 2016/08/13 18:17:24 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.570 $ */
|
||||
/* Copyright (c) Steve Creps, 1988. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1609,6 +1609,7 @@ E boolean FDECL(the_unique_pm, (struct permonst *));
|
||||
E boolean FDECL(erosion_matters, (struct obj *));
|
||||
E char *FDECL(doname, (struct obj *));
|
||||
E char *FDECL(doname_with_price, (struct obj *));
|
||||
E char *FDECL(doname_vague_quan, (struct obj *));
|
||||
E boolean FDECL(not_fully_identified, (struct obj *));
|
||||
E char *FDECL(corpse_xname, (struct obj *, const char *, unsigned));
|
||||
E char *FDECL(cxname, (struct obj *));
|
||||
@@ -2774,7 +2775,7 @@ E struct monst *FDECL(montraits, (struct obj *, coord *));
|
||||
E struct monst *FDECL(revive, (struct obj *, BOOLEAN_P));
|
||||
E int FDECL(unturn_dead, (struct monst *));
|
||||
E void FDECL(cancel_item, (struct obj *));
|
||||
E boolean FDECL(drain_item, (struct obj *));
|
||||
E boolean FDECL(drain_item, (struct obj *, BOOLEAN_P));
|
||||
E struct obj *FDECL(poly_obj, (struct obj *, int));
|
||||
E boolean FDECL(obj_resists, (struct obj *, int, int));
|
||||
E boolean FDECL(obj_shudders, (struct obj *));
|
||||
|
||||
Reference in New Issue
Block a user