nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2018-06-11 16:36:27 -04:00
parent d82564cf5a 0b52288154
commit 6585b58c57
42 changed files with 641 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
include/.gitattributes vendored Normal file
View File

@@ -0,0 +1,43 @@
* NH_filestag=(file%s_for_all_versions)
..files NH_filegenerated=win32api.h,tile.h,dgn_comp.h,lev_comp.h,date.h,onames.h,pm.h,vis_tab.h
win32api.h NH_filesgentag=(file%s_for_win32_that_are_moved_into_include_at_compile_time)
tile.h NH_filesgentag=(file%s_for_tiles_support_copied_from_win/share_at_compile_time)
dgn_comp.h NH_filesgentag=(file%s_generated_by_yacc_(or_copied_from_sys/share)_at_compile_time)
lev_comp.h NH_filesgentag=>dgn_comp.h
date.h NH_filesgentag=(file%s_generated_by_makedefs_at_compile_time)
onames.h NH_filesgentag=>date.h
pm.h NH_filesgentag=>date.h
vis_tab.h NH_filesgentag=>date.h
wintty.h NH_filestag=(file%s_for_tty_versions)
tile2x11.h NH_filestag=(file%s_for_X_versions)
winX.h NH_filestag=>tile2x11.h
xwindow.h NH_filestag=>tile2x11.h
xwindowp.h NH_filestag=>tile2x11.h
qt_clust.h NH_filestag=(file%s_for_Qt_versions)
qt_kde0.h NH_filestag=>qt_clust.h
qt_win.h NH_filestag=>qt_clust.h
qt_xpms.h NH_filestag=>qt_clust.h
qttableview.h NH_filestag=>qt_clust.h
bitmfile.h NH_filestag=(file%s_for_GEM_versions)
gem_rsc.h NH_filestag=>bitmfile.h
load_img.h NH_filestag=>bitmfile.h
wingem.h NH_filestag=>bitmfile.h
winGnome.h NH_filestag=(file%s_for_GNOME_versions)
mac-carbon.h NH_filestag=(file%s_for_various_Macintosh_versions)
mac-qt.h NH_filestag=>mac-carbon.h
mac-term.h NH_filestag=>mac-carbon.h
macconf.h NH_filestag=>mac-carbon.h
macpopup.h NH_filestag=>mac-carbon.h
mactty.h NH_filestag=>mac-carbon.h
macwin.h NH_filestag=>mac-carbon.h
mttypriv.h NH_filestag=>mac-carbon.h

5
include/extern.h
View File

@@ -934,7 +934,9 @@ E void FDECL(strbuf_nl_to_crlf, (strbuf_t *));
/* ### invent.c ### */
E void FDECL(sortloot, (struct obj **, unsigned, BOOLEAN_P));
E Loot *FDECL(sortloot, (struct obj **, unsigned, BOOLEAN_P,
boolean (*)(OBJ_P)));
E void FDECL(unsortloot, (Loot **));
E void FDECL(assigninvlet, (struct obj *));
E struct obj *FDECL(merge_choice, (struct obj *, struct obj *));
E int FDECL(merged, (struct obj **, struct obj **));
@@ -2844,6 +2846,7 @@ E void FDECL(bypass_obj, (struct obj *));
E void NDECL(clear_bypasses);
E void FDECL(bypass_objlist, (struct obj *, BOOLEAN_P));
E struct obj *FDECL(nxt_unbypassed_obj, (struct obj *));
E struct obj *FDECL(nxt_unbypassed_loot, (Loot *, struct obj *));
E int FDECL(racial_exception, (struct monst *, struct obj *));
/* ### write.c ### */

12
include/hack.h
View File

@@ -190,6 +190,14 @@ enum hmon_atkmode_types {
HMON_DRAGGED /* attached iron ball, pulled into mon */
};
/* sortloot() return type; needed before extern.h */
struct sortloot_item {
struct obj *obj;
int indx; /* signed int, because sortloot()'s qsort comparison routine
assumes (a->indx - b->indx) might yield a negative result */
};
typedef struct sortloot_item Loot;
#define MATCH_WARN_OF_MON(mon) \
(Warn_of_mon && ((context.warntype.obj \
&& (context.warntype.obj & (mon)->data->mflags2)) \
@@ -215,8 +223,7 @@ enum hmon_atkmode_types {
#define SYM_OFF_X (SYM_OFF_W + WARNCOUNT)
#define SYM_MAX (SYM_OFF_X + MAXOTHER)
#ifdef USE_TRAMPOLI /* This doesn't belong here, but we have little choice \
*/
#ifdef USE_TRAMPOLI /* this doesn't belong here, but we have little choice */
#undef NDECL
#define NDECL(f) f()
#endif
@@ -369,6 +376,7 @@ enum explosion_types {
#define SORTLOOT_PACK 0x01
#define SORTLOOT_INVLET 0x02
#define SORTLOOT_LOOT 0x04
#define SORTLOOT_PETRIFY 0x20 /* override filter func for c-trice corpses */
/* flags for xkilled() [note: meaning of first bit used to be reversed,
1 to give message and 0 to suppress] */