NetHack minor release checklist items - savefiles
Make some progress on a couple of next minor release checklist
items, hopefully without introducing too many new bugs. This
is just the initial commit, and work continues.
Checklist items:
Savefiles compatible between Windows versions, whether 64-bit
or 32-bit in little-endian field format.
Selection of file formats:
historical (structlevel saves),
lendian (little-endian, fieldlevel saves),
and just for proof-of-concept, ascii fieldlevel saves
(the ascii is huge! 10x bigger than little-endian).
For the fieldlevel save, all complex data structures recursively
get broken down until until it is one of the simple types that
can't be broken down any further, and that gets when it gets
written to the output file.
New files needed for this build:
hand-coded:
include/sfprocs.h
src/sfbase.c - really a dispatcher to one of the
output/input format routines.
src/sflendian.c - little-endian output writer/reader.
src/sfascii.c - ascii text output writer/reader.
auto-coded (generated):
include/sfproto.h
src/sfdata.c
This is just one approach. I'm sure there are countless others
and they have different pros and cons.
For producing the auto-coded files a utility called
universal-ctags, that is actively maintained and evolving,
was used to do all the heavy-lifting of parsing the
NetHack C sources to tabulate the data fields, and store
them in an intermediate file called util/nethack.tags
(not required for building NetHack if you already have a
generated include/sfproto.h and src/sfdata.c)
util/readtags (also not required for building NetHack
itself) will decipher the nethack.tags file and produce
the functions that can deal with the NetHack struct data
fields.
You can obtain the source for universal-ctags by cloning it
from here:
https://github.com/universal-ctags/ctags.git
The combination universal-ctags + util/readtags has been
tried and tested under both Windows and Linux, so it is
not tied to a particular platform.
Note: util/readtags will work only with universal-ctags
output, so other ctags are unlikely to work as-is.
Universal-ctags can be build from source very easily
under Linux, or under Windows using visual studio.
This commit is contained in:
nhmall
@@ -8,7 +8,7 @@
|
||||
|
||||
#define E extern
|
||||
|
||||
#if !defined(MFLOPPY) && !defined(VMS) && !defined(WIN32)
|
||||
#if !defined(MFLOPPY) && !defined(VMS)
|
||||
#define LOCKNAMESIZE (PL_NSIZ + 14) /* long enough for uid+name+.99 */
|
||||
#define LOCKNAMEINIT "1lock"
|
||||
#define BONESINIT "bonesnn.xxx"
|
||||
@@ -26,22 +26,18 @@
|
||||
#define BONESINIT "bonesnn.xxx;1"
|
||||
#define BONESSIZE sizeof(BONESINIT)
|
||||
#endif
|
||||
#if defined(WIN32)
|
||||
#define LOCKNAMESIZE (PL_NSIZ + 25) /* long enough for username+-+name+.99 */
|
||||
#define LOCKNAMEINIT ""
|
||||
#define BONESINIT "bonesnn.xxx"
|
||||
#define BONESSIZE sizeof(BONESINIT)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* This is written to a savefile by a defined size on some platforms,
|
||||
so let's not create an automatic and unnecessary incompatibility */
|
||||
#if defined(UNIX) || defined(__BEOS__)
|
||||
#define SAVESIZE (PL_NSIZ + 13) /* save/99999player.e */
|
||||
#define SAVESIZE (PL_NSIZ + 50) /* save/99999player.e */
|
||||
#else
|
||||
#ifdef VMS
|
||||
#define SAVESIZE (PL_NSIZ + 22) /* [.save]<uid>player.e;1 */
|
||||
#define SAVESIZE (PL_NSIZ + 50) /* [.save]<uid>player.e;1 */
|
||||
#else
|
||||
#if defined(WIN32)
|
||||
#define SAVESIZE (PL_NSIZ + 40) /* username-player.NetHack-saved-game */
|
||||
#define SAVESIZE (PL_NSIZ + 50) /* username-player.NetHack-saved-game */
|
||||
#else
|
||||
#define SAVESIZE FILENAME /* from macconf.h or pcconf.h */
|
||||
#endif
|
||||
@@ -162,6 +158,52 @@ struct sinfo {
|
||||
int wizkit_wishing;
|
||||
};
|
||||
|
||||
/* Flags for controlling uptodate */
|
||||
#define UTD_CHECKSIZES 0x01
|
||||
#define UTD_CHECKFIELDCOUNTS 0x02
|
||||
#define UTD_SKIP_SANITY1 0x04
|
||||
#define UTD_SKIP_SAVEFILEINFO 0x08
|
||||
|
||||
/* NetHack ftypes */
|
||||
#define NHF_LEVELFILE 1
|
||||
#define NHF_SAVEFILE 2
|
||||
#define NHF_BONESFILE 3
|
||||
/* modes */
|
||||
#define READING 0x0
|
||||
#define COUNTING 0x1
|
||||
#define WRITING 0x2
|
||||
#define FREEING 0x4
|
||||
#define MAX_BMASK 4
|
||||
/* operations of the various saveXXXchn & co. routines */
|
||||
#define perform_bwrite(nhfp) ((nhfp)->mode & (COUNTING | WRITING))
|
||||
#define release_data(nhfp) ((nhfp)->mode & FREEING)
|
||||
|
||||
/* Content types for fieldlevel files */
|
||||
struct fieldlevel_content {
|
||||
boolean deflt; /* individual fields */
|
||||
boolean binary; /* binary rather than text */
|
||||
boolean json; /* JSON */
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
int fd; /* for traditional structlevel binary writes */
|
||||
int mode; /* holds READING, WRITING, or FREEING modes */
|
||||
int ftype; /* NHF_LEVELFILE, NHF_SAVEFILE, or NHF_BONESFILE */
|
||||
int fnidx; /* index of procs for fieldlevel saves */
|
||||
long count; /* holds current line count for default style file,
|
||||
field count for binary style */
|
||||
boolean structlevel; /* traditional structure binary saves */
|
||||
boolean fieldlevel; /* fieldlevel saves saves each field individually */
|
||||
boolean addinfo; /* if set, some additional context info from core */
|
||||
boolean eof; /* place to mark eof reached */
|
||||
boolean bendian; /* set to true if executing on a big-endian machine */
|
||||
FILE *fpdef; /* file pointer for fieldlevel default style */
|
||||
FILE *fpdefmap; /* file pointer mapfile for def format */
|
||||
FILE *fplog; /* file pointer logfile */
|
||||
FILE *fpdebug; /* file pointer debug info */
|
||||
struct fieldlevel_content style;
|
||||
} NHFILE;
|
||||
|
||||
E const char quitchars[];
|
||||
E const char vowels[];
|
||||
E const char ynchars[];
|
||||
@@ -349,6 +391,14 @@ E const char *const monexplain[], invisexplain[], *const oclass_names[];
|
||||
E const char *fqn_prefix_names[PREFIX_COUNT];
|
||||
#endif
|
||||
|
||||
struct restore_procs {
|
||||
const char *name;
|
||||
int mread_flags;
|
||||
void NDECL((*restore_minit));
|
||||
void FDECL((*restore_mread), (int,genericptr_t,unsigned int));
|
||||
void FDECL((*restore_bclose), (int));
|
||||
};
|
||||
|
||||
E NEARDATA struct savefile_info sfcap, sfrestinfo, sfsaveinfo;
|
||||
|
||||
struct opvar {
|
||||
|
||||
105
include/extern.h
105
include/extern.h
@@ -56,8 +56,8 @@ E int FDECL(unfixable_trouble_count, (BOOLEAN_P));
|
||||
/* ### artifact.c ### */
|
||||
|
||||
E void NDECL(init_artifacts);
|
||||
E void FDECL(save_artifacts, (int));
|
||||
E void FDECL(restore_artifacts, (int));
|
||||
E void FDECL(save_artifacts, (NHFILE *));
|
||||
E void FDECL(restore_artifacts, (NHFILE *));
|
||||
E const char *FDECL(artiname, (int));
|
||||
E struct obj *FDECL(mk_artifact, (struct obj *, ALIGNTYP_P));
|
||||
E const char *FDECL(artifact_name, (const char *, short *));
|
||||
@@ -596,8 +596,8 @@ E boolean FDECL(cursed_object_at, (int, int));
|
||||
|
||||
/* ### dungeon.c ### */
|
||||
|
||||
E void FDECL(save_dungeon, (int, BOOLEAN_P, BOOLEAN_P));
|
||||
E void FDECL(restore_dungeon, (int));
|
||||
E void FDECL(save_dungeon, (NHFILE *, BOOLEAN_P, BOOLEAN_P));
|
||||
E void FDECL(restore_dungeon, (NHFILE *));
|
||||
E void FDECL(insert_branch, (branch *, BOOLEAN_P));
|
||||
E void NDECL(init_dungeons);
|
||||
E s_level *FDECL(find_level, (const char *));
|
||||
@@ -716,8 +716,8 @@ E int NDECL(num_genocides);
|
||||
E void FDECL(delayed_killer, (int, int, const char *));
|
||||
E struct kinfo *FDECL(find_delayed_killer, (int));
|
||||
E void FDECL(dealloc_killer, (struct kinfo *));
|
||||
E void FDECL(save_killers, (int, int));
|
||||
E void FDECL(restore_killers, (int));
|
||||
E void FDECL(save_killers, (NHFILE *));
|
||||
E void FDECL(restore_killers, (NHFILE *));
|
||||
E char *FDECL(build_english_list, (char *));
|
||||
#if defined(PANICTRACE) && !defined(NO_SIGNAL)
|
||||
E void FDECL(panictrace_setsignals, (BOOLEAN_P));
|
||||
@@ -741,8 +741,8 @@ E void FDECL(del_engr_at, (int, int));
|
||||
E int NDECL(freehand);
|
||||
E int NDECL(doengrave);
|
||||
E void NDECL(sanitize_engravings);
|
||||
E void FDECL(save_engravings, (int, int));
|
||||
E void FDECL(rest_engravings, (int));
|
||||
E void FDECL(save_engravings, (NHFILE *));
|
||||
E void FDECL(rest_engravings, (NHFILE *));
|
||||
E void FDECL(engr_stats, (const char *, char *, long *, long *));
|
||||
E void FDECL(del_engr, (struct engr *));
|
||||
E void FDECL(rloc_engr, (struct engr *));
|
||||
@@ -781,30 +781,33 @@ E FILE *FDECL(fopen_datafile, (const char *, const char *, int));
|
||||
#ifdef MFLOPPY
|
||||
E void NDECL(set_lock_and_bones);
|
||||
#endif
|
||||
E void FDECL(zero_nhfile, (NHFILE *));
|
||||
E void FDECL(close_nhfile, (NHFILE *));
|
||||
E void FDECL(rewind_nhfile, (NHFILE *));
|
||||
E void FDECL(set_levelfile_name, (char *, int));
|
||||
E int FDECL(create_levelfile, (int, char *));
|
||||
E int FDECL(open_levelfile, (int, char *));
|
||||
E NHFILE *FDECL(create_levelfile, (int, char *));
|
||||
E NHFILE *FDECL(open_levelfile, (int, char *));
|
||||
E void FDECL(delete_levelfile, (int));
|
||||
E void NDECL(clearlocks);
|
||||
E int FDECL(create_bonesfile, (d_level *, char **, char *));
|
||||
E NHFILE *FDECL(create_bonesfile, (d_level *, char **, char *));
|
||||
#ifdef MFLOPPY
|
||||
E void NDECL(cancel_bonesfile);
|
||||
#endif
|
||||
E void FDECL(commit_bonesfile, (d_level *));
|
||||
E int FDECL(open_bonesfile, (d_level *, char **));
|
||||
E NHFILE *FDECL(open_bonesfile, (d_level *, char **));
|
||||
E int FDECL(delete_bonesfile, (d_level *));
|
||||
E void NDECL(compress_bonesfile);
|
||||
E void FDECL(set_savefile_name, (BOOLEAN_P));
|
||||
#ifdef INSURANCE
|
||||
E void FDECL(save_savefile_name, (int));
|
||||
E void FDECL(save_savefile_name, (NHFILE *));
|
||||
#endif
|
||||
#ifndef MICRO
|
||||
E void NDECL(set_error_savefile);
|
||||
#endif
|
||||
E int NDECL(create_savefile);
|
||||
E int NDECL(open_savefile);
|
||||
E NHFILE *NDECL(create_savefile);
|
||||
E NHFILE *NDECL(open_savefile);
|
||||
E int NDECL(delete_savefile);
|
||||
E int NDECL(restore_saved_game);
|
||||
E NHFILE *NDECL(restore_saved_game);
|
||||
E void FDECL(nh_compress, (const char *));
|
||||
E void FDECL(nh_uncompress, (const char *));
|
||||
E boolean FDECL(lock_file, (const char *, int, int));
|
||||
@@ -1070,8 +1073,8 @@ E void FDECL(do_light_sources, (char **));
|
||||
E void FDECL(show_transient_light, (struct obj *, int, int));
|
||||
E void NDECL(transient_light_cleanup);
|
||||
E struct monst *FDECL(find_mid, (unsigned, unsigned));
|
||||
E void FDECL(save_light_sources, (int, int, int));
|
||||
E void FDECL(restore_light_sources, (int));
|
||||
E void FDECL(save_light_sources, (NHFILE *, int));
|
||||
E void FDECL(restore_light_sources, (NHFILE *));
|
||||
E void FDECL(light_stats, (const char *, char *, long *, long *));
|
||||
E void FDECL(relink_light_sources, (BOOLEAN_P));
|
||||
E void NDECL(light_sources_sanity_check);
|
||||
@@ -1300,8 +1303,8 @@ E void NDECL(fixup_special);
|
||||
E void NDECL(fumaroles);
|
||||
E void NDECL(movebubbles);
|
||||
E void NDECL(water_friction);
|
||||
E void FDECL(save_waterlevel, (int, int));
|
||||
E void FDECL(restore_waterlevel, (int));
|
||||
E void FDECL(save_waterlevel, (NHFILE *));
|
||||
E void FDECL(restore_waterlevel, (NHFILE *));
|
||||
E const char *FDECL(waterbody_name, (XCHAR_P, XCHAR_P));
|
||||
|
||||
/* ### mkobj.c ### */
|
||||
@@ -1388,8 +1391,8 @@ E boolean FDECL(inside_room, (struct mkroom *, XCHAR_P, XCHAR_P));
|
||||
E boolean FDECL(somexy, (struct mkroom *, coord *));
|
||||
E void FDECL(mkundead, (coord *, BOOLEAN_P, int));
|
||||
E struct permonst *NDECL(courtmon);
|
||||
E void FDECL(save_rooms, (int));
|
||||
E void FDECL(rest_rooms, (int));
|
||||
E void FDECL(save_rooms, (NHFILE *));
|
||||
E void FDECL(rest_rooms, (NHFILE *));
|
||||
E struct mkroom *FDECL(search_special, (SCHAR_P));
|
||||
E int FDECL(cmap_to_type, (int));
|
||||
|
||||
@@ -1674,8 +1677,8 @@ E void NDECL(init_objects);
|
||||
E void FDECL(obj_shuffle_range, (int, int *, int *));
|
||||
E int NDECL(find_skates);
|
||||
E void NDECL(oinit);
|
||||
E void FDECL(savenames, (int, int));
|
||||
E void FDECL(restnames, (int));
|
||||
E void FDECL(savenames, (NHFILE *));
|
||||
E void FDECL(restnames, (NHFILE *));
|
||||
E void FDECL(discover_object, (int, BOOLEAN_P, BOOLEAN_P));
|
||||
E void FDECL(undiscover_object, (int));
|
||||
E int NDECL(dodiscovered);
|
||||
@@ -2098,8 +2101,8 @@ E void NDECL(update_player_regions);
|
||||
E void FDECL(update_monster_region, (struct monst *));
|
||||
E NhRegion *FDECL(visible_region_at, (XCHAR_P, XCHAR_P));
|
||||
E void FDECL(show_region, (NhRegion *, XCHAR_P, XCHAR_P));
|
||||
E void FDECL(save_regions, (int, int));
|
||||
E void FDECL(rest_regions, (int, BOOLEAN_P));
|
||||
E void FDECL(save_regions, (NHFILE *));
|
||||
E void FDECL(rest_regions, (NHFILE *, BOOLEAN_P));
|
||||
E void FDECL(region_stats, (const char *, char *, long *, long *));
|
||||
E NhRegion *FDECL(create_gas_cloud, (XCHAR_P, XCHAR_P, int, int));
|
||||
E boolean NDECL(region_danger);
|
||||
@@ -2108,18 +2111,19 @@ E void NDECL(region_safety);
|
||||
/* ### restore.c ### */
|
||||
|
||||
E void FDECL(inven_inuse, (BOOLEAN_P));
|
||||
E int FDECL(dorecover, (int));
|
||||
E void FDECL(restcemetery, (int, struct cemetery **));
|
||||
E int FDECL(dorecover, (NHFILE *));
|
||||
E void FDECL(restcemetery, (NHFILE *, struct cemetery **));
|
||||
E void FDECL(trickery, (char *));
|
||||
E void FDECL(getlev, (int, int, XCHAR_P, BOOLEAN_P));
|
||||
E void FDECL(get_plname_from_file, (int, char *));
|
||||
E void FDECL(getlev, (NHFILE *, int, XCHAR_P, BOOLEAN_P));
|
||||
E void FDECL(get_plname_from_file, (NHFILE *, char *));
|
||||
#ifdef SELECTSAVED
|
||||
E int FDECL(restore_menu, (winid));
|
||||
#endif
|
||||
E void NDECL(minit);
|
||||
E boolean FDECL(lookup_id_mapping, (unsigned, unsigned *));
|
||||
E void FDECL(mread, (int, genericptr_t, unsigned int));
|
||||
E int FDECL(validate, (int, const char *));
|
||||
E void FDECL(newread, (NHFILE *, int, int, genericptr_t, unsigned int));
|
||||
E int FDECL(validate, (NHFILE *, const char *));
|
||||
E void NDECL(reset_restpref);
|
||||
E void FDECL(set_restpref, (const char *));
|
||||
E void FDECL(set_savepref, (const char *));
|
||||
@@ -2183,8 +2187,8 @@ E char *FDECL(getrumor, (int, char *, BOOLEAN_P));
|
||||
E char *FDECL(get_rnd_text, (const char *, char *, int FDECL((*), (int))));
|
||||
E void FDECL(outrumor, (int, int));
|
||||
E void FDECL(outoracle, (BOOLEAN_P, BOOLEAN_P));
|
||||
E void FDECL(save_oracles, (int, int));
|
||||
E void FDECL(restore_oracles, (int));
|
||||
E void FDECL(save_oracles, (NHFILE *));
|
||||
E void FDECL(restore_oracles, (NHFILE *));
|
||||
E int FDECL(doconsult, (struct monst *));
|
||||
E void NDECL(rumor_check);
|
||||
|
||||
@@ -2192,16 +2196,16 @@ E void NDECL(rumor_check);
|
||||
|
||||
E int NDECL(dosave);
|
||||
E int NDECL(dosave0);
|
||||
E boolean FDECL(tricked_fileremoved, (int, char *));
|
||||
E boolean FDECL(tricked_fileremoved, (NHFILE *, char *));
|
||||
#ifdef INSURANCE
|
||||
E void NDECL(savestateinlock);
|
||||
#endif
|
||||
#ifdef MFLOPPY
|
||||
E boolean FDECL(savelev, (int, XCHAR_P, int));
|
||||
E boolean FDECL(savelev, (NHFILE *, XCHAR_P));
|
||||
E boolean FDECL(swapin_file, (int));
|
||||
E void NDECL(co_false);
|
||||
#else
|
||||
E void FDECL(savelev, (int, XCHAR_P, int));
|
||||
E void FDECL(savelev, (NHFILE *, XCHAR_P));
|
||||
#endif
|
||||
E genericptr_t FDECL(mon_to_buffer, (struct monst *, int *));
|
||||
E void FDECL(bufon, (int));
|
||||
@@ -2210,15 +2214,22 @@ E void FDECL(bflush, (int));
|
||||
E void FDECL(bwrite, (int, genericptr_t, unsigned int));
|
||||
E void FDECL(bclose, (int));
|
||||
E void FDECL(def_bclose, (int));
|
||||
E void FDECL(newwrite, (NHFILE *, int, int, genericptr_t, unsigned int));
|
||||
E void FDECL(newclose, (NHFILE *));
|
||||
#if defined(ZEROCOMP)
|
||||
E void FDECL(zerocomp_bclose, (int));
|
||||
#endif
|
||||
E void FDECL(savecemetery, (int, int, struct cemetery **));
|
||||
E void FDECL(savefruitchn, (int, int));
|
||||
E void FDECL(store_plname_in_file, (int));
|
||||
E void FDECL(savecemetery, (NHFILE *, struct cemetery **));
|
||||
E void FDECL(savefruitchn, (NHFILE *));
|
||||
E void FDECL(store_plname_in_file, (NHFILE *));
|
||||
E void NDECL(free_dungeons);
|
||||
E void NDECL(freedynamicdata);
|
||||
E void FDECL(store_savefileinfo, (int));
|
||||
E void FDECL(store_savefileinfo, (NHFILE *));
|
||||
E void FDECL(store_savefileinfo, (NHFILE *));
|
||||
E int NDECL(nhdatatypes_size);
|
||||
E void FDECL(assignlog, (char *, char*, int));
|
||||
E FILE *FDECL(getlog, (NHFILE *));
|
||||
E void FDECL(closelog, (NHFILE *));
|
||||
|
||||
/* ### shk.c ### */
|
||||
|
||||
@@ -2455,8 +2466,8 @@ E void FDECL(spot_stop_timers, (XCHAR_P, XCHAR_P, SHORT_P));
|
||||
E long FDECL(spot_time_expires, (XCHAR_P, XCHAR_P, SHORT_P));
|
||||
E long FDECL(spot_time_left, (XCHAR_P, XCHAR_P, SHORT_P));
|
||||
E boolean FDECL(obj_is_local, (struct obj *));
|
||||
E void FDECL(save_timers, (int, int, int));
|
||||
E void FDECL(restore_timers, (int, int, BOOLEAN_P, long));
|
||||
E void FDECL(save_timers, (NHFILE *, int));
|
||||
E void FDECL(restore_timers, (NHFILE *, int, BOOLEAN_P, long));
|
||||
E void FDECL(timer_stats, (const char *, char *, long *, long *));
|
||||
E void FDECL(relink_timers, (BOOLEAN_P));
|
||||
E int NDECL(wiz_timeout_queue);
|
||||
@@ -2630,9 +2641,9 @@ E int NDECL(doextversion);
|
||||
E boolean FDECL(comp_times, (long));
|
||||
#endif
|
||||
E boolean
|
||||
FDECL(check_version, (struct version_info *, const char *, BOOLEAN_P));
|
||||
E boolean FDECL(uptodate, (int, const char *));
|
||||
E void FDECL(store_version, (int));
|
||||
FDECL(check_version, (struct version_info *, const char *, BOOLEAN_P, unsigned long));
|
||||
E boolean FDECL(uptodate, (NHFILE *, const char *, unsigned long));
|
||||
E void FDECL(store_version, (NHFILE *));
|
||||
E unsigned long FDECL(get_feature_notice_ver, (char *));
|
||||
E unsigned long NDECL(get_current_feature_ver);
|
||||
E const char *FDECL(copyright_banner_line, (int));
|
||||
@@ -2882,8 +2893,8 @@ E void FDECL(wormhitu, (struct monst *));
|
||||
E void FDECL(cutworm, (struct monst *, XCHAR_P, XCHAR_P, BOOLEAN_P));
|
||||
E void FDECL(see_wsegs, (struct monst *));
|
||||
E void FDECL(detect_wsegs, (struct monst *, BOOLEAN_P));
|
||||
E void FDECL(save_worm, (int, int));
|
||||
E void FDECL(rest_worm, (int));
|
||||
E void FDECL(save_worm, (NHFILE *));
|
||||
E void FDECL(rest_worm, (NHFILE *));
|
||||
E void FDECL(place_wsegs, (struct monst *, struct monst *));
|
||||
E void FDECL(sanity_check_worm, (struct monst *));
|
||||
E void FDECL(remove_worm, (struct monst *));
|
||||
|
||||
@@ -232,6 +232,13 @@ enum hmon_atkmode_types {
|
||||
HMON_DRAGGED = 4 /* attached iron ball, pulled into mon */
|
||||
};
|
||||
|
||||
enum saveformats {
|
||||
invalid = 0,
|
||||
historical = 1, /* entire struct, binary, as-is */
|
||||
lendian = 2, /* each field, binary, little-endian */
|
||||
ascii = 3 /* each field, ascii text (just proof of concept) */
|
||||
};
|
||||
|
||||
/* sortloot() return type; needed before extern.h */
|
||||
struct sortloot_item {
|
||||
struct obj *obj;
|
||||
|
||||
@@ -8,12 +8,5 @@
|
||||
#ifndef LEV_H
|
||||
#define LEV_H
|
||||
|
||||
#define COUNT_SAVE 0x1
|
||||
#define WRITE_SAVE 0x2
|
||||
#define FREE_SAVE 0x4
|
||||
|
||||
/* operations of the various saveXXXchn & co. routines */
|
||||
#define perform_bwrite(mode) ((mode) & (COUNT_SAVE | WRITE_SAVE))
|
||||
#define release_data(mode) ((mode) &FREE_SAVE)
|
||||
|
||||
#endif /* LEV_H */
|
||||
|
||||
@@ -80,6 +80,7 @@
|
||||
* objects being thrown when the hangup occurs. \
|
||||
*/
|
||||
|
||||
#define MAIL
|
||||
/* Stuff to help the user with some common, yet significant errors */
|
||||
#define INTERJECT_PANIC 0
|
||||
#define INTERJECTION_TYPES (INTERJECT_PANIC + 1)
|
||||
@@ -104,6 +105,7 @@ extern void NDECL(getlock);
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define HAS_STDINT
|
||||
#if (_MSC_VER > 1000)
|
||||
/* Visual C 8 warning elimination */
|
||||
#ifndef _CRT_SECURE_NO_DEPRECATE
|
||||
|
||||
192
include/sfprocs.h
Normal file
192
include/sfprocs.h
Normal file
@@ -0,0 +1,192 @@
|
||||
/* NetHack 3.6 sfprocs.h Tue Nov 6 19:38:48 2018 */
|
||||
/* Copyright (c) NetHack Development Team 2018. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
#ifndef SFPROCS_H
|
||||
#define SFPROCS_H
|
||||
|
||||
#include "hack.h"
|
||||
#include "integer.h"
|
||||
#include "wintype.h"
|
||||
|
||||
#define E extern
|
||||
|
||||
/* output routines */
|
||||
E void FDECL(ascii_sfo_aligntyp, (NHFILE *, aligntyp *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_any, (NHFILE *, union any *d_any, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_bitfield, (NHFILE *, uint8_t *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_boolean, (NHFILE *, boolean *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_char, (NHFILE *, char *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_genericptr, (NHFILE *, genericptr_t *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_int, (NHFILE *, int *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_long, (NHFILE *, long *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_schar, (NHFILE *, schar *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_short, (NHFILE *, short *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_size_t, (NHFILE *, size_t *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_time_t, (NHFILE *, time_t *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_unsigned, (NHFILE *, unsigned *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_uchar, (NHFILE *, unsigned char *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_uint, (NHFILE *, unsigned int *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_ulong, (NHFILE *, unsigned long *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_ushort, (NHFILE *, unsigned short *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_xchar, (NHFILE *, xchar *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_str, (NHFILE *, char *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfo_addinfo, (NHFILE *, const char *, const char *, const char *, int));
|
||||
|
||||
/* input routines */
|
||||
E void FDECL(ascii_sfi_aligntyp, (NHFILE *, aligntyp *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_any, (NHFILE *, union any *d_any, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_bitfield, (NHFILE *, uint8_t *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_boolean, (NHFILE *, boolean *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_char, (NHFILE *, char *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_genericptr, (NHFILE *, genericptr_t *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_int, (NHFILE *, int *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_long, (NHFILE *, long *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_schar, (NHFILE *, schar *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_short, (NHFILE *, short *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_size_t, (NHFILE *, size_t *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_time_t, (NHFILE *, time_t *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_unsigned, (NHFILE *, unsigned *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_uchar, (NHFILE *, unsigned char *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_uint, (NHFILE *, unsigned int *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_ulong, (NHFILE *, unsigned long *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_ushort, (NHFILE *, unsigned short *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_xchar, (NHFILE *, xchar *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_str, (NHFILE *, char *, const char *, const char *, int));
|
||||
E void FDECL(ascii_sfi_addinfo, (NHFILE *, const char *, const char *, const char *, int));
|
||||
|
||||
/* output routines */
|
||||
E void FDECL(lendian_sfo_aligntyp, (NHFILE *, aligntyp *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_any, (NHFILE *, union any *d_any, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_bitfield, (NHFILE *, uint8_t *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_boolean, (NHFILE *, boolean *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_char, (NHFILE *, char *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_genericptr, (NHFILE *, genericptr_t *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_int, (NHFILE *, int *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_long, (NHFILE *, long *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_schar, (NHFILE *, schar *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_short, (NHFILE *, short *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_size_t, (NHFILE *, size_t *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_time_t, (NHFILE *, time_t *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_unsigned, (NHFILE *, unsigned *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_uchar, (NHFILE *, unsigned char *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_uint, (NHFILE *, unsigned int *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_ulong, (NHFILE *, unsigned long *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_ushort, (NHFILE *, unsigned short *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_xchar, (NHFILE *, xchar *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_str, (NHFILE *, char *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfo_addinfo, (NHFILE *, const char *, const char *, const char *, int));
|
||||
|
||||
/* input routines */
|
||||
E void FDECL(lendian_sfi_aligntyp, (NHFILE *, aligntyp *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_any, (NHFILE *, union any *d_any, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_bitfield, (NHFILE *, uint8_t *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_boolean, (NHFILE *, boolean *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_char, (NHFILE *, char *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_genericptr, (NHFILE *, genericptr_t *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_int, (NHFILE *, int *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_long, (NHFILE *, long *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_schar, (NHFILE *, schar *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_short, (NHFILE *, short *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_size_t, (NHFILE *, size_t *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_time_t, (NHFILE *, time_t *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_unsigned, (NHFILE *, unsigned *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_uchar, (NHFILE *, unsigned char *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_uint, (NHFILE *, unsigned int *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_ulong, (NHFILE *, unsigned long *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_ushort, (NHFILE *, unsigned short *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_xchar, (NHFILE *, xchar *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_str, (NHFILE *, char *, const char *, const char *, int));
|
||||
E void FDECL(lendian_sfi_addinfo, (NHFILE *, const char *, const char *, const char *, int));
|
||||
|
||||
#ifdef JSON_SUPPORT
|
||||
/* output routines */
|
||||
E void FDECL(json_sfo_aligntyp, (NHFILE *, aligntype *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_any, (NHFILE *, union any *d_any, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_bitfield, (NHFILE *, uint8_t *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_boolean, (NHFILE *, boolean *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_char, (NHFILE *, char *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_genericptr, (NHFILE *, genericptr_t *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_int, (NHFILE *, int *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_long, (NHFILE *, long *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_schar, (NHFILE *, schar *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_short, (NHFILE *, short *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_size_t, (NHFILE *, size_t *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_time_t, (NHFILE *, time_t *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_unsigned, (NHFILE *, unsigned *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_uchar, (NHFILE *, unsigned char *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_uint, (NHFILE *, unsigned int *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_ulong, (NHFILE *, unsigned long *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_ushort, (NHFILE *, unsigned short *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_xchar, (NHFILE *, xchar *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_str, (NHFILE *, char *, const char *, const char *, int));
|
||||
E void FDECL(json_sfo_addinfo), (NHFILE *, const char *, const char *, const char *, int));
|
||||
|
||||
/* input routines */
|
||||
E void FDECL(json_sfi_aligntyp, (NHFILE *, aligntype *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_any, (NHFILE *, union any *d_any, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_bitfield, (NHFILE *, uint8_t *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_boolean, (NHFILE *, boolean *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_char, (NHFILE *, char *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_genericptr, (NHFILE *, genericptr_t *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_int, (NHFILE *, int *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_long, (NHFILE *, long *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_schar, (NHFILE *, schar *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_short, (NHFILE *, short *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_size_t, (NHFILE *, size_t *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_time_t, (NHFILE *, time_t *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_unsigned, (NHFILE *, unsigned *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_uchar, (NHFILE *, unsigned char *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_uint, (NHFILE *, unsigned int *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_ulong, (NHFILE *, unsigned long *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_ushort, (NHFILE *, unsigned short *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_xchar, (NHFILE *, xchar *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_str, (NHFILE *, char *, const char *, const char *, int));
|
||||
E void FDECL(json_sfi_addinfo), (NHFILE *, const char *, const char *, const char *, int));
|
||||
#endif /* JSON_SUPPORT */
|
||||
|
||||
struct fieldlevel_procs {
|
||||
void FDECL((*sf_aligntyp), (NHFILE *, aligntyp *, const char *, const char *, int));
|
||||
void FDECL((*sf_any), (NHFILE *, union any *d_any, const char *, const char *, int));
|
||||
void FDECL((*sf_bitfield), (NHFILE *, uint8_t *, const char *, const char *, int));
|
||||
void FDECL((*sf_boolean), (NHFILE *, boolean *, const char *, const char *, int));
|
||||
void FDECL((*sf_char), (NHFILE *, char *, const char *, const char *, int));
|
||||
void FDECL((*sf_genericptr), (NHFILE *, genericptr_t *, const char *, const char *, int));
|
||||
void FDECL((*sf_int), (NHFILE *, int *, const char *, const char *, int));
|
||||
void FDECL((*sf_long), (NHFILE *, long *, const char *, const char *, int));
|
||||
void FDECL((*sf_schar), (NHFILE *, schar *, const char *, const char *, int));
|
||||
void FDECL((*sf_short), (NHFILE *, short *, const char *, const char *, int));
|
||||
void FDECL((*sf_size_t), (NHFILE *, size_t *, const char *, const char *, int));
|
||||
void FDECL((*sf_time_t), (NHFILE *, time_t *, const char *, const char *, int));
|
||||
void FDECL((*sf_unsigned), (NHFILE *, unsigned *, const char *, const char *, int));
|
||||
void FDECL((*sf_uchar), (NHFILE *, unsigned char *, const char *, const char *, int));
|
||||
void FDECL((*sf_uint), (NHFILE *, unsigned int *, const char *, const char *, int));
|
||||
void FDECL((*sf_ulong), (NHFILE *, unsigned long *, const char *, const char *, int));
|
||||
void FDECL((*sf_ushort), (NHFILE *, unsigned short *, const char *, const char *, int));
|
||||
void FDECL((*sf_xchar), (NHFILE *, xchar *, const char *, const char *, int));
|
||||
void FDECL((*sf_str), (NHFILE *, char *, const char *, const char *, int));
|
||||
void FDECL((*sf_addinfo), (NHFILE *, const char *, const char *, const char *, int));
|
||||
};
|
||||
|
||||
struct sf_procs {
|
||||
const char *ext;
|
||||
struct fieldlevel_procs fn;
|
||||
};
|
||||
|
||||
E void NDECL(sf_init);
|
||||
E struct sf_procs sfoprocs[4], sfiprocs[4];
|
||||
|
||||
E struct sf_procs ascii_sfo_procs;
|
||||
E struct sf_procs ascii_sfi_procs;
|
||||
E struct sf_procs lendian_sfo_procs;
|
||||
E struct sf_procs lendian_sfi_procs;
|
||||
E struct sf_procs stub_sfo_procs;
|
||||
E struct sf_procs stub_sfi_procs;
|
||||
|
||||
#ifdef JSON_SUPPORT
|
||||
E struct sf_procs json_sfo_procs;
|
||||
E struct sf_procs json_sfi_procs;
|
||||
#endif
|
||||
|
||||
#undef E
|
||||
#endif /* SFPROCS_H */
|
||||
201
include/sfproto.h
Normal file
201
include/sfproto.h
Normal file
@@ -0,0 +1,201 @@
|
||||
/* NetHack 3.7 sfproto.h Sat Jun 22 23:55:47 2019 */
|
||||
/* Copyright (c) NetHack Development Team 2018. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
/* THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE! */
|
||||
|
||||
#ifndef SFPROTO_H
|
||||
#define SFPROTO_H
|
||||
|
||||
#include "hack.h"
|
||||
#include "integer.h"
|
||||
#include "wintype.h"
|
||||
|
||||
#define E extern
|
||||
|
||||
E int NDECL(critical_members_count);
|
||||
/* sfbase.c output functions */
|
||||
E void FDECL(sfo_addinfo, (NHFILE *, const char *, const char *, const char *, int));
|
||||
E void FDECL(sfo_aligntyp, (NHFILE *, aligntyp *, const char *, const char *, int));
|
||||
E void FDECL(sfo_any, (NHFILE *, anything *, const char *, const char *, int));
|
||||
E void FDECL(sfo_bitfield, (NHFILE *, uint8_t *, const char *, const char *, int));
|
||||
E void FDECL(sfo_boolean, (NHFILE *, boolean *, const char *, const char *, int));
|
||||
E void FDECL(sfo_char, (NHFILE *, const char *, const char *, const char *, int));
|
||||
E void FDECL(sfo_genericptr, (NHFILE *, genericptr_t *, const char *, const char *, int));
|
||||
E void FDECL(sfo_int, (NHFILE *, int *, const char *, const char *, int));
|
||||
E void FDECL(sfo_long, (NHFILE *, long *, const char *, const char *, int));
|
||||
E void FDECL(sfo_schar, (NHFILE *, schar *, const char *, const char *, int));
|
||||
E void FDECL(sfo_short, (NHFILE *, short *, const char *, const char *, int));
|
||||
E void FDECL(sfo_size_t, (NHFILE *, size_t *, const char *, const char *, int));
|
||||
E void FDECL(sfo_time_t, (NHFILE *, time_t *, const char *, const char *, int));
|
||||
E void FDECL(sfo_uchar, (NHFILE *, uchar *, const char *, const char *, int));
|
||||
E void FDECL(sfo_unsigned, (NHFILE *, unsigned *, const char *, const char *, int));
|
||||
E void FDECL(sfo_uchar, (NHFILE *, unsigned char *, const char *, const char *, int));
|
||||
E void FDECL(sfo_uint, (NHFILE *, unsigned int *, const char *, const char *, int));
|
||||
E void FDECL(sfo_ulong, (NHFILE *, unsigned long *, const char *, const char *, int));
|
||||
E void FDECL(sfo_ushort, (NHFILE *, unsigned short *, const char *, const char *, int));
|
||||
E void FDECL(sfo_xchar, (NHFILE *, xchar *, const char *, const char *, int));
|
||||
E void FDECL(sfo_str, (NHFILE *, const char *, const char *, const char *, int));
|
||||
/* sfbase.c input functions */
|
||||
E void FDECL(sfi_addinfo, (NHFILE *, const char *, const char *, const char *, int));
|
||||
E void FDECL(sfi_aligntyp, (NHFILE *, aligntyp *, const char *, const char *, int));
|
||||
E void FDECL(sfi_any, (NHFILE *, anything *, const char *, const char *, int));
|
||||
E void FDECL(sfi_bitfield, (NHFILE *, uint8_t *, const char *, const char *, int));
|
||||
E void FDECL(sfi_boolean, (NHFILE *, boolean *, const char *, const char *, int));
|
||||
E void FDECL(sfi_char, (NHFILE *, const char *, const char *, const char *, int));
|
||||
E void FDECL(sfi_genericptr, (NHFILE *, genericptr_t *, const char *, const char *, int));
|
||||
E void FDECL(sfi_int, (NHFILE *, int *, const char *, const char *, int));
|
||||
E void FDECL(sfi_long, (NHFILE *, long *, const char *, const char *, int));
|
||||
E void FDECL(sfi_schar, (NHFILE *, schar *, const char *, const char *, int));
|
||||
E void FDECL(sfi_short, (NHFILE *, short *, const char *, const char *, int));
|
||||
E void FDECL(sfi_size_t, (NHFILE *, size_t *, const char *, const char *, int));
|
||||
E void FDECL(sfi_time_t, (NHFILE *, time_t *, const char *, const char *, int));
|
||||
E void FDECL(sfi_uchar, (NHFILE *, uchar *, const char *, const char *, int));
|
||||
E void FDECL(sfi_unsigned, (NHFILE *, unsigned *, const char *, const char *, int));
|
||||
E void FDECL(sfi_uchar, (NHFILE *, unsigned char *, const char *, const char *, int));
|
||||
E void FDECL(sfi_uint, (NHFILE *, unsigned int *, const char *, const char *, int));
|
||||
E void FDECL(sfi_ulong, (NHFILE *, unsigned long *, const char *, const char *, int));
|
||||
E void FDECL(sfi_ushort, (NHFILE *, unsigned short *, const char *, const char *, int));
|
||||
E void FDECL(sfi_xchar, (NHFILE *, xchar *, const char *, const char *, int));
|
||||
E void FDECL(sfi_str, (NHFILE *, const char *, const char *, const char *, int));
|
||||
/* generated output functions */
|
||||
E void FDECL(sfo_align, (NHFILE *, struct align *, const char *, const char *, int));
|
||||
E void FDECL(sfo_attribs, (NHFILE *, struct attribs *, const char *, const char *, int));
|
||||
E void FDECL(sfo_bill_x, (NHFILE *, struct bill_x *, const char *, const char *, int));
|
||||
E void FDECL(sfo_book_info, (NHFILE *, struct book_info *, const char *, const char *, int));
|
||||
E void FDECL(sfo_branch, (NHFILE *, struct branch *, const char *, const char *, int));
|
||||
E void FDECL(sfo_bubble, (NHFILE *, struct bubble *, const char *, const char *, int));
|
||||
E void FDECL(sfo_cemetery, (NHFILE *, struct cemetery *, const char *, const char *, int));
|
||||
E void FDECL(sfo_context_info, (NHFILE *, struct context_info *, const char *, const char *, int));
|
||||
E void FDECL(sfo_d_flags, (NHFILE *, struct d_flags *, const char *, const char *, int));
|
||||
E void FDECL(sfo_d_level, (NHFILE *, struct d_level *, const char *, const char *, int));
|
||||
E void FDECL(sfo_damage, (NHFILE *, struct damage *, const char *, const char *, int));
|
||||
E void FDECL(sfo_dest_area, (NHFILE *, struct dest_area *, const char *, const char *, int));
|
||||
E void FDECL(sfo_dgn_topology, (NHFILE *, struct dgn_topology *, const char *, const char *, int));
|
||||
E void FDECL(sfo_dig_info, (NHFILE *, struct dig_info *, const char *, const char *, int));
|
||||
E void FDECL(sfo_dungeon, (NHFILE *, struct dungeon *, const char *, const char *, int));
|
||||
E void FDECL(sfo_edog, (NHFILE *, struct edog *, const char *, const char *, int));
|
||||
E void FDECL(sfo_egd, (NHFILE *, struct egd *, const char *, const char *, int));
|
||||
E void FDECL(sfo_emin, (NHFILE *, struct emin *, const char *, const char *, int));
|
||||
E void FDECL(sfo_engr, (NHFILE *, struct engr *, const char *, const char *, int));
|
||||
E void FDECL(sfo_epri, (NHFILE *, struct epri *, const char *, const char *, int));
|
||||
E void FDECL(sfo_eshk, (NHFILE *, struct eshk *, const char *, const char *, int));
|
||||
E void FDECL(sfo_fakecorridor, (NHFILE *, struct fakecorridor *, const char *, const char *, int));
|
||||
E void FDECL(sfo_fe, (NHFILE *, struct fe *, const char *, const char *, int));
|
||||
E void FDECL(sfo_flag, (NHFILE *, struct flag *, const char *, const char *, int));
|
||||
E void FDECL(sfo_fruit, (NHFILE *, struct fruit *, const char *, const char *, int));
|
||||
E void FDECL(sfo_kinfo, (NHFILE *, struct kinfo *, const char *, const char *, int));
|
||||
E void FDECL(sfo_levelflags, (NHFILE *, struct levelflags *, const char *, const char *, int));
|
||||
E void FDECL(sfo_linfo, (NHFILE *, struct linfo *, const char *, const char *, int));
|
||||
E void FDECL(sfo_ls_t, (NHFILE *, struct ls_t *, const char *, const char *, int));
|
||||
E void FDECL(sfo_mapseen_feat, (NHFILE *, struct mapseen_feat *, const char *, const char *, int));
|
||||
E void FDECL(sfo_mapseen_flags, (NHFILE *, struct mapseen_flags *, const char *, const char *, int));
|
||||
E void FDECL(sfo_mapseen_rooms, (NHFILE *, struct mapseen_rooms *, const char *, const char *, int));
|
||||
E void FDECL(sfo_mapseen, (NHFILE *, struct mapseen *, const char *, const char *, int));
|
||||
E void FDECL(sfo_mextra, (NHFILE *, struct mextra *, const char *, const char *, int));
|
||||
E void FDECL(sfo_mkroom, (NHFILE *, struct mkroom *, const char *, const char *, int));
|
||||
E void FDECL(sfo_monst, (NHFILE *, struct monst *, const char *, const char *, int));
|
||||
E void FDECL(sfo_mvitals, (NHFILE *, struct mvitals *, const char *, const char *, int));
|
||||
E void FDECL(sfo_nhcoord, (NHFILE *, struct nhcoord *, const char *, const char *, int));
|
||||
E void FDECL(sfo_nhrect, (NHFILE *, struct nhrect *, const char *, const char *, int));
|
||||
E void FDECL(sfo_novel_tracking, (NHFILE *, struct novel_tracking *, const char *, const char *, int));
|
||||
E void FDECL(sfo_obj, (NHFILE *, struct obj *, const char *, const char *, int));
|
||||
E void FDECL(sfo_objclass, (NHFILE *, struct objclass *, const char *, const char *, int));
|
||||
E void FDECL(sfo_obj_split, (NHFILE *, struct obj_split *, const char *, const char *, int));
|
||||
E void FDECL(sfo_oextra, (NHFILE *, struct oextra *, const char *, const char *, int));
|
||||
E void FDECL(sfo_polearm_info, (NHFILE *, struct polearm_info *, const char *, const char *, int));
|
||||
E void FDECL(sfo_prop, (NHFILE *, struct prop *, const char *, const char *, int));
|
||||
E void FDECL(sfo_q_score, (NHFILE *, struct q_score *, const char *, const char *, int));
|
||||
E void FDECL(sfo_rm, (NHFILE *, struct rm *, const char *, const char *, int));
|
||||
E void FDECL(sfo_s_level, (NHFILE *, struct s_level *, const char *, const char *, int));
|
||||
E void FDECL(sfo_savefile_info, (NHFILE *, struct savefile_info *, const char *, const char *, int));
|
||||
E void FDECL(sfo_skills, (NHFILE *, struct skills *, const char *, const char *, int));
|
||||
E void FDECL(sfo_spell, (NHFILE *, struct spell *, const char *, const char *, int));
|
||||
E void FDECL(sfo_stairway, (NHFILE *, struct stairway *, const char *, const char *, int));
|
||||
E void FDECL(sfo_takeoff_info, (NHFILE *, struct takeoff_info *, const char *, const char *, int));
|
||||
E void FDECL(sfo_tin_info, (NHFILE *, struct tin_info *, const char *, const char *, int));
|
||||
E void FDECL(sfo_trap, (NHFILE *, struct trap *, const char *, const char *, int));
|
||||
E void FDECL(sfo_tribute_info, (NHFILE *, struct tribute_info *, const char *, const char *, int));
|
||||
E void FDECL(sfo_u_achieve, (NHFILE *, struct u_achieve *, const char *, const char *, int));
|
||||
E void FDECL(sfo_u_conduct, (NHFILE *, struct u_conduct *, const char *, const char *, int));
|
||||
E void FDECL(sfo_u_event, (NHFILE *, struct u_event *, const char *, const char *, int));
|
||||
E void FDECL(sfo_u_have, (NHFILE *, struct u_have *, const char *, const char *, int));
|
||||
E void FDECL(sfo_u_realtime, (NHFILE *, struct u_realtime *, const char *, const char *, int));
|
||||
E void FDECL(sfo_u_roleplay, (NHFILE *, struct u_roleplay *, const char *, const char *, int));
|
||||
E void FDECL(sfo_version_info, (NHFILE *, struct version_info *, const char *, const char *, int));
|
||||
E void FDECL(sfo_victual_info, (NHFILE *, struct victual_info *, const char *, const char *, int));
|
||||
E void FDECL(sfo_vlaunchinfo, (NHFILE *, union vlaunchinfo *, const char *, const char *, int));
|
||||
E void FDECL(sfo_vptrs, (NHFILE *, union vptrs *, const char *, const char *, int));
|
||||
E void FDECL(sfo_warntype_info, (NHFILE *, struct warntype_info *, const char *, const char *, int));
|
||||
E void FDECL(sfo_you, (NHFILE *, struct you *, const char *, const char *, int));
|
||||
/* generated input functions */
|
||||
E void FDECL(sfi_align, (NHFILE *, struct align *, const char *, const char *, int));
|
||||
E void FDECL(sfi_attribs, (NHFILE *, struct attribs *, const char *, const char *, int));
|
||||
E void FDECL(sfi_bill_x, (NHFILE *, struct bill_x *, const char *, const char *, int));
|
||||
E void FDECL(sfi_book_info, (NHFILE *, struct book_info *, const char *, const char *, int));
|
||||
E void FDECL(sfi_branch, (NHFILE *, struct branch *, const char *, const char *, int));
|
||||
E void FDECL(sfi_bubble, (NHFILE *, struct bubble *, const char *, const char *, int));
|
||||
E void FDECL(sfi_cemetery, (NHFILE *, struct cemetery *, const char *, const char *, int));
|
||||
E void FDECL(sfi_context_info, (NHFILE *, struct context_info *, const char *, const char *, int));
|
||||
E void FDECL(sfi_d_flags, (NHFILE *, struct d_flags *, const char *, const char *, int));
|
||||
E void FDECL(sfi_d_level, (NHFILE *, struct d_level *, const char *, const char *, int));
|
||||
E void FDECL(sfi_damage, (NHFILE *, struct damage *, const char *, const char *, int));
|
||||
E void FDECL(sfi_dest_area, (NHFILE *, struct dest_area *, const char *, const char *, int));
|
||||
E void FDECL(sfi_dgn_topology, (NHFILE *, struct dgn_topology *, const char *, const char *, int));
|
||||
E void FDECL(sfi_dig_info, (NHFILE *, struct dig_info *, const char *, const char *, int));
|
||||
E void FDECL(sfi_dungeon, (NHFILE *, struct dungeon *, const char *, const char *, int));
|
||||
E void FDECL(sfi_edog, (NHFILE *, struct edog *, const char *, const char *, int));
|
||||
E void FDECL(sfi_egd, (NHFILE *, struct egd *, const char *, const char *, int));
|
||||
E void FDECL(sfi_emin, (NHFILE *, struct emin *, const char *, const char *, int));
|
||||
E void FDECL(sfi_engr, (NHFILE *, struct engr *, const char *, const char *, int));
|
||||
E void FDECL(sfi_epri, (NHFILE *, struct epri *, const char *, const char *, int));
|
||||
E void FDECL(sfi_eshk, (NHFILE *, struct eshk *, const char *, const char *, int));
|
||||
E void FDECL(sfi_fakecorridor, (NHFILE *, struct fakecorridor *, const char *, const char *, int));
|
||||
E void FDECL(sfi_fe, (NHFILE *, struct fe *, const char *, const char *, int));
|
||||
E void FDECL(sfi_flag, (NHFILE *, struct flag *, const char *, const char *, int));
|
||||
E void FDECL(sfi_fruit, (NHFILE *, struct fruit *, const char *, const char *, int));
|
||||
E void FDECL(sfi_kinfo, (NHFILE *, struct kinfo *, const char *, const char *, int));
|
||||
E void FDECL(sfi_levelflags, (NHFILE *, struct levelflags *, const char *, const char *, int));
|
||||
E void FDECL(sfi_linfo, (NHFILE *, struct linfo *, const char *, const char *, int));
|
||||
E void FDECL(sfi_ls_t, (NHFILE *, struct ls_t *, const char *, const char *, int));
|
||||
E void FDECL(sfi_mapseen_feat, (NHFILE *, struct mapseen_feat *, const char *, const char *, int));
|
||||
E void FDECL(sfi_mapseen_flags, (NHFILE *, struct mapseen_flags *, const char *, const char *, int));
|
||||
E void FDECL(sfi_mapseen_rooms, (NHFILE *, struct mapseen_rooms *, const char *, const char *, int));
|
||||
E void FDECL(sfi_mapseen, (NHFILE *, struct mapseen *, const char *, const char *, int));
|
||||
E void FDECL(sfi_mextra, (NHFILE *, struct mextra *, const char *, const char *, int));
|
||||
E void FDECL(sfi_mkroom, (NHFILE *, struct mkroom *, const char *, const char *, int));
|
||||
E void FDECL(sfi_monst, (NHFILE *, struct monst *, const char *, const char *, int));
|
||||
E void FDECL(sfi_mvitals, (NHFILE *, struct mvitals *, const char *, const char *, int));
|
||||
E void FDECL(sfi_nhcoord, (NHFILE *, struct nhcoord *, const char *, const char *, int));
|
||||
E void FDECL(sfi_nhrect, (NHFILE *, struct nhrect *, const char *, const char *, int));
|
||||
E void FDECL(sfi_novel_tracking, (NHFILE *, struct novel_tracking *, const char *, const char *, int));
|
||||
E void FDECL(sfi_obj, (NHFILE *, struct obj *, const char *, const char *, int));
|
||||
E void FDECL(sfi_objclass, (NHFILE *, struct objclass *, const char *, const char *, int));
|
||||
E void FDECL(sfi_obj_split, (NHFILE *, struct obj_split *, const char *, const char *, int));
|
||||
E void FDECL(sfi_oextra, (NHFILE *, struct oextra *, const char *, const char *, int));
|
||||
E void FDECL(sfi_polearm_info, (NHFILE *, struct polearm_info *, const char *, const char *, int));
|
||||
E void FDECL(sfi_prop, (NHFILE *, struct prop *, const char *, const char *, int));
|
||||
E void FDECL(sfi_q_score, (NHFILE *, struct q_score *, const char *, const char *, int));
|
||||
E void FDECL(sfi_rm, (NHFILE *, struct rm *, const char *, const char *, int));
|
||||
E void FDECL(sfi_s_level, (NHFILE *, struct s_level *, const char *, const char *, int));
|
||||
E void FDECL(sfi_savefile_info, (NHFILE *, struct savefile_info *, const char *, const char *, int));
|
||||
E void FDECL(sfi_skills, (NHFILE *, struct skills *, const char *, const char *, int));
|
||||
E void FDECL(sfi_spell, (NHFILE *, struct spell *, const char *, const char *, int));
|
||||
E void FDECL(sfi_stairway, (NHFILE *, struct stairway *, const char *, const char *, int));
|
||||
E void FDECL(sfi_takeoff_info, (NHFILE *, struct takeoff_info *, const char *, const char *, int));
|
||||
E void FDECL(sfi_tin_info, (NHFILE *, struct tin_info *, const char *, const char *, int));
|
||||
E void FDECL(sfi_trap, (NHFILE *, struct trap *, const char *, const char *, int));
|
||||
E void FDECL(sfi_tribute_info, (NHFILE *, struct tribute_info *, const char *, const char *, int));
|
||||
E void FDECL(sfi_u_achieve, (NHFILE *, struct u_achieve *, const char *, const char *, int));
|
||||
E void FDECL(sfi_u_conduct, (NHFILE *, struct u_conduct *, const char *, const char *, int));
|
||||
E void FDECL(sfi_u_event, (NHFILE *, struct u_event *, const char *, const char *, int));
|
||||
E void FDECL(sfi_u_have, (NHFILE *, struct u_have *, const char *, const char *, int));
|
||||
E void FDECL(sfi_u_realtime, (NHFILE *, struct u_realtime *, const char *, const char *, int));
|
||||
E void FDECL(sfi_u_roleplay, (NHFILE *, struct u_roleplay *, const char *, const char *, int));
|
||||
E void FDECL(sfi_version_info, (NHFILE *, struct version_info *, const char *, const char *, int));
|
||||
E void FDECL(sfi_victual_info, (NHFILE *, struct victual_info *, const char *, const char *, int));
|
||||
E void FDECL(sfi_vlaunchinfo, (NHFILE *, union vlaunchinfo *, const char *, const char *, int));
|
||||
E void FDECL(sfi_vptrs, (NHFILE *, union vptrs *, const char *, const char *, int));
|
||||
E void FDECL(sfi_warntype_info, (NHFILE *, struct warntype_info *, const char *, const char *, int));
|
||||
E void FDECL(sfi_you, (NHFILE *, struct you *, const char *, const char *, int));
|
||||
#endif /* SFPROTO_H */
|
||||
@@ -41,6 +41,10 @@ struct sysopt {
|
||||
char *greppath;
|
||||
int panictrace_gdb;
|
||||
int panictrace_libc;
|
||||
|
||||
/* save and bones format */
|
||||
int saveformat[2]; /* primary and onetime conversion */
|
||||
int bonesformat[2]; /* primary and onetime conversion */
|
||||
};
|
||||
|
||||
extern struct sysopt sysopt;
|
||||
|
||||
@@ -59,8 +59,7 @@ struct u_achieve {
|
||||
Bitfield(bell, 1); /* touched Bell */
|
||||
Bitfield(book, 1); /* touched Book */
|
||||
Bitfield(menorah, 1); /* touched Candelabrum */
|
||||
Bitfield(enter_gehennom,
|
||||
1); /* entered Gehennom (or Valley) by any means */
|
||||
Bitfield(enter_gehennom,1); /* entered Gehennom (or Valley) by any means */
|
||||
Bitfield(ascended, 1); /* not quite the same as u.uevent.ascended */
|
||||
Bitfield(mines_luckstone, 1); /* got a luckstone at end of mines */
|
||||
Bitfield(finish_sokoban, 1); /* obtained the sokoban prize */
|
||||
|
||||
Reference in New Issue
Block a user