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

updates for build on OpenVMS

Browse Source
This commit is contained in:
nhmall
2025-08-28 11:43:47 -04:00
parent 6a086c7725
commit f110db02fc
6 changed files with 168 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

292
src/sfbase.c
View File

@@ -658,442 +658,442 @@ sf_setflprocs(int idx, struct sf_fieldlevel_procs *flsfi,
} }
#ifndef SFCTOOL #ifndef SFCTOOL
void normalize_pointers_any(union any *d_any); void norm_ptrs_any(union any *d_any);
void normalize_pointers_align(struct align *d_align); void norm_ptrs_align(struct align *d_align);
void normalize_pointers_arti_info(struct arti_info *d_arti_info); void norm_ptrs_arti_info(struct arti_info *d_arti_info);
void normalize_pointers_attribs(struct attribs *d_attribs); void norm_ptrs_attribs(struct attribs *d_attribs);
void normalize_pointers_bill_x(struct bill_x *d_bill_x); void norm_ptrs_bill_x(struct bill_x *d_bill_x);
void normalize_pointers_branch(struct branch *d_branch); void norm_ptrs_branch(struct branch *d_branch);
void normalize_pointers_bubble(struct bubble *d_bubble); void norm_ptrs_bubble(struct bubble *d_bubble);
void normalize_pointers_cemetery(struct cemetery *d_cemetery); void norm_ptrs_cemetery(struct cemetery *d_cemetery);
void normalize_pointers_context_info(struct context_info *d_context_info); void norm_ptrs_context_info(struct context_info *d_context_info);
void normalize_pointers_achievement_tracking( void norm_ptrs_achievement_tracking(
struct achievement_tracking *d_achievement_tracking); struct achievement_tracking *d_achievement_tracking);
void normalize_pointers_book_info(struct book_info *d_book_info); void norm_ptrs_book_info(struct book_info *d_book_info);
void normalize_pointers_dig_info(struct dig_info *d_dig_info); void norm_ptrs_dig_info(struct dig_info *d_dig_info);
void normalize_pointers_engrave_info(struct engrave_info *d_engrave_info); void norm_ptrs_engrave_info(struct engrave_info *d_engrave_info);
void normalize_pointers_obj_split(struct obj_split *d_obj_split); void norm_ptrs_obj_split(struct obj_split *d_obj_split);
void normalize_pointers_polearm_info(struct polearm_info *d_polearm_info); void norm_ptrs_polearm_info(struct polearm_info *d_polearm_info);
void normalize_pointers_takeoff_info(struct takeoff_info *d_takeoff_info); void norm_ptrs_takeoff_info(struct takeoff_info *d_takeoff_info);
void normalize_pointers_tin_info(struct tin_info *d_tin_info); void norm_ptrs_tin_info(struct tin_info *d_tin_info);
void normalize_pointers_tribute_info(struct tribute_info *d_tribute_info); void norm_ptrs_tribute_info(struct tribute_info *d_tribute_info);
void normalize_pointers_victual_info(struct victual_info *d_victual_info); void norm_ptrs_victual_info(struct victual_info *d_victual_info);
void normalize_pointers_warntype_info(struct warntype_info *d_warntype_info); void norm_ptrs_warntype_info(struct warntype_info *d_warntype_info);
void normalize_pointers_d_flags(struct d_flags *d_d_flags); void norm_ptrs_d_flags(struct d_flags *d_d_flags);
void normalize_pointers_d_level(struct d_level *d_d_level); void norm_ptrs_d_level(struct d_level *d_d_level);
void normalize_pointers_damage(struct damage *d_damage); void norm_ptrs_damage(struct damage *d_damage);
void normalize_pointers_dest_area(struct dest_area *d_dest_area); void norm_ptrs_dest_area(struct dest_area *d_dest_area);
void normalize_pointers_dgn_topology(struct dgn_topology *d_dgn_topology); void norm_ptrs_dgn_topology(struct dgn_topology *d_dgn_topology);
void normalize_pointers_dungeon(struct dungeon *d_dungeon); void norm_ptrs_dungeon(struct dungeon *d_dungeon);
void normalize_pointers_ebones(struct ebones *d_ebones); void norm_ptrs_ebones(struct ebones *d_ebones);
void normalize_pointers_edog(struct edog *d_edog); void norm_ptrs_edog(struct edog *d_edog);
void normalize_pointers_egd(struct egd *d_egd); void norm_ptrs_egd(struct egd *d_egd);
void normalize_pointers_emin(struct emin *d_emin); void norm_ptrs_emin(struct emin *d_emin);
void normalize_pointers_engr(struct engr *d_engr); void norm_ptrs_engr(struct engr *d_engr);
void normalize_pointers_epri(struct epri *d_epri); void norm_ptrs_epri(struct epri *d_epri);
void normalize_pointers_eshk(struct eshk *d_eshk); void norm_ptrs_eshk(struct eshk *d_eshk);
void normalize_pointers_fakecorridor(struct fakecorridor *d_fakecorridor); void norm_ptrs_fakecorridor(struct fakecorridor *d_fakecorridor);
void normalize_pointers_fe(struct fe *d_fe); void norm_ptrs_fe(struct fe *d_fe);
void normalize_pointers_flag(struct flag *d_flag); void norm_ptrs_flag(struct flag *d_flag);
void normalize_pointers_fruit(struct fruit *d_fruit); void norm_ptrs_fruit(struct fruit *d_fruit);
void normalize_pointers_gamelog_line(struct gamelog_line *d_gamelog_line); void norm_ptrs_gamelog_line(struct gamelog_line *d_gamelog_line);
void normalize_pointers_kinfo(struct kinfo *d_kinfo); void norm_ptrs_kinfo(struct kinfo *d_kinfo);
void normalize_pointers_levelflags(struct levelflags *d_levelflags); void norm_ptrs_levelflags(struct levelflags *d_levelflags);
void normalize_pointers_linfo(struct linfo *d_linfo); void norm_ptrs_linfo(struct linfo *d_linfo);
void normalize_pointers_ls_t(struct ls_t *d_ls_t); void norm_ptrs_ls_t(struct ls_t *d_ls_t);
void normalize_pointers_mapseen_feat(struct mapseen_feat *d_mapseen_feat); void norm_ptrs_mapseen_feat(struct mapseen_feat *d_mapseen_feat);
void normalize_pointers_mapseen_flags(struct mapseen_flags *d_mapseen_flags); void norm_ptrs_mapseen_flags(struct mapseen_flags *d_mapseen_flags);
void normalize_pointers_mapseen_rooms(struct mapseen_rooms *d_mapseen_rooms); void norm_ptrs_mapseen_rooms(struct mapseen_rooms *d_mapseen_rooms);
void normalize_pointers_mapseen(struct mapseen *d_mapseen); void norm_ptrs_mapseen(struct mapseen *d_mapseen);
void normalize_pointers_mextra(struct mextra *d_mextra); void norm_ptrs_mextra(struct mextra *d_mextra);
void normalize_pointers_mkroom(struct mkroom *d_mkroom); void norm_ptrs_mkroom(struct mkroom *d_mkroom);
void normalize_pointers_monst(struct monst *d_monst); void norm_ptrs_monst(struct monst *d_monst);
void normalize_pointers_mvitals(struct mvitals *d_mvitals); void norm_ptrs_mvitals(struct mvitals *d_mvitals);
void normalize_pointers_nhcoord(struct nhcoord *d_nhcoord); void norm_ptrs_nhcoord(struct nhcoord *d_nhcoord);
void normalize_pointers_nhrect(struct nhrect *d_nhrect); void norm_ptrs_nhrect(struct nhrect *d_nhrect);
void normalize_pointers_novel_tracking(struct novel_tracking *d_novel_tracking); void norm_ptrs_novel_tracking(struct novel_tracking *d_novel_tracking);
void normalize_pointers_obj(struct obj *d_obj); void norm_ptrs_obj(struct obj *d_obj);
void normalize_pointers_objclass(struct objclass *d_objclass); void norm_ptrs_objclass(struct objclass *d_objclass);
void normalize_pointers_oextra(struct oextra *d_oextra); void norm_ptrs_oextra(struct oextra *d_oextra);
void normalize_pointers_prop(struct prop *d_prop); void norm_ptrs_prop(struct prop *d_prop);
void normalize_pointers_q_score(struct q_score *d_q_score); void norm_ptrs_q_score(struct q_score *d_q_score);
void normalize_pointers_rm(struct rm *d_rm); void norm_ptrs_rm(struct rm *d_rm);
void normalize_pointers_s_level(struct s_level *d_s_level); void norm_ptrs_s_level(struct s_level *d_s_level);
void normalize_pointers_skills(struct skills *d_skills); void norm_ptrs_skills(struct skills *d_skills);
void normalize_pointers_spell(struct spell *d_spell); void norm_ptrs_spell(struct spell *d_spell);
void normalize_pointers_stairway(struct stairway *d_stairway); void norm_ptrs_stairway(struct stairway *d_stairway);
void normalize_pointers_trap(struct trap *d_trap); void norm_ptrs_trap(struct trap *d_trap);
void normalize_pointers_u_conduct(struct u_conduct *d_u_conduct); void norm_ptrs_u_conduct(struct u_conduct *d_u_conduct);
void normalize_pointers_u_event(struct u_event *d_u_event); void norm_ptrs_u_event(struct u_event *d_u_event);
void normalize_pointers_u_have(struct u_have *d_u_have); void norm_ptrs_u_have(struct u_have *d_u_have);
void normalize_pointers_u_realtime(struct u_realtime *d_u_realtime); void norm_ptrs_u_realtime(struct u_realtime *d_u_realtime);
void normalize_pointers_u_roleplay(struct u_roleplay *d_u_roleplay); void norm_ptrs_u_roleplay(struct u_roleplay *d_u_roleplay);
void normalize_pointers_version_info(struct version_info *d_version_info); void norm_ptrs_version_info(struct version_info *d_version_info);
void normalize_pointers_vlaunchinfo(union vlaunchinfo *d_vlaunchinfo); void norm_ptrs_vlaunchinfo(union vlaunchinfo *d_vlaunchinfo);
void normalize_pointers_vptrs(union vptrs *d_vptrs); void norm_ptrs_vptrs(union vptrs *d_vptrs);
void normalize_pointers_you(struct you *d_you); void norm_ptrs_you(struct you *d_you);
void void
normalize_pointers_any(union any *d_any UNUSED) norm_ptrs_any(union any *d_any UNUSED)
{ {
} }
void void
normalize_pointers_align(struct align *d_align UNUSED) norm_ptrs_align(struct align *d_align UNUSED)
{ {
} }
void void
normalize_pointers_arti_info(struct arti_info *d_arti_info UNUSED) norm_ptrs_arti_info(struct arti_info *d_arti_info UNUSED)
{ {
} }
void void
normalize_pointers_attribs(struct attribs *d_attribs UNUSED) norm_ptrs_attribs(struct attribs *d_attribs UNUSED)
{ {
} }
void void
normalize_pointers_bill_x(struct bill_x *d_bill_x UNUSED) norm_ptrs_bill_x(struct bill_x *d_bill_x UNUSED)
{ {
} }
void void
normalize_pointers_branch(struct branch *d_branch UNUSED) norm_ptrs_branch(struct branch *d_branch UNUSED)
{ {
} }
void void
normalize_pointers_bubble(struct bubble *d_bubble UNUSED) norm_ptrs_bubble(struct bubble *d_bubble UNUSED)
{ {
} }
void void
normalize_pointers_cemetery(struct cemetery *d_cemetery UNUSED) norm_ptrs_cemetery(struct cemetery *d_cemetery UNUSED)
{ {
} }
void void
normalize_pointers_context_info(struct context_info *d_context_info UNUSED) norm_ptrs_context_info(struct context_info *d_context_info UNUSED)
{ {
} }
void void
normalize_pointers_achievement_tracking(struct achievement_tracking *d_achievement_tracking UNUSED) norm_ptrs_achievement_tracking(struct achievement_tracking *d_achievement_tracking UNUSED)
{ {
} }
void void
normalize_pointers_book_info(struct book_info *d_book_info UNUSED) norm_ptrs_book_info(struct book_info *d_book_info UNUSED)
{ {
} }
void void
normalize_pointers_dig_info(struct dig_info *d_dig_info UNUSED) norm_ptrs_dig_info(struct dig_info *d_dig_info UNUSED)
{ {
} }
void void
normalize_pointers_engrave_info(struct engrave_info *d_engrave_info UNUSED) norm_ptrs_engrave_info(struct engrave_info *d_engrave_info UNUSED)
{ {
} }
void void
normalize_pointers_obj_split(struct obj_split *d_obj_split UNUSED) norm_ptrs_obj_split(struct obj_split *d_obj_split UNUSED)
{ {
} }
void void
normalize_pointers_polearm_info(struct polearm_info *d_polearm_info UNUSED) norm_ptrs_polearm_info(struct polearm_info *d_polearm_info UNUSED)
{ {
} }
void void
normalize_pointers_takeoff_info(struct takeoff_info *d_takeoff_info UNUSED) norm_ptrs_takeoff_info(struct takeoff_info *d_takeoff_info UNUSED)
{ {
} }
void void
normalize_pointers_tin_info(struct tin_info *d_tin_info UNUSED) norm_ptrs_tin_info(struct tin_info *d_tin_info UNUSED)
{ {
} }
void void
normalize_pointers_tribute_info(struct tribute_info *d_tribute_info UNUSED) norm_ptrs_tribute_info(struct tribute_info *d_tribute_info UNUSED)
{ {
} }
void void
normalize_pointers_victual_info(struct victual_info *d_victual_info UNUSED) norm_ptrs_victual_info(struct victual_info *d_victual_info UNUSED)
{ {
} }
void void
normalize_pointers_warntype_info(struct warntype_info *d_warntype_info UNUSED) norm_ptrs_warntype_info(struct warntype_info *d_warntype_info UNUSED)
{ {
} }
void void
normalize_pointers_d_flags(struct d_flags *d_d_flags UNUSED) norm_ptrs_d_flags(struct d_flags *d_d_flags UNUSED)
{ {
} }
void void
normalize_pointers_d_level(struct d_level *d_d_level UNUSED) norm_ptrs_d_level(struct d_level *d_d_level UNUSED)
{ {
} }
void void
normalize_pointers_damage(struct damage *d_damage UNUSED) norm_ptrs_damage(struct damage *d_damage UNUSED)
{ {
} }
void void
normalize_pointers_dest_area(struct dest_area *d_dest_area UNUSED) norm_ptrs_dest_area(struct dest_area *d_dest_area UNUSED)
{ {
} }
void void
normalize_pointers_dgn_topology(struct dgn_topology *d_dgn_topology UNUSED) norm_ptrs_dgn_topology(struct dgn_topology *d_dgn_topology UNUSED)
{ {
} }
void void
normalize_pointers_dungeon(struct dungeon *d_dungeon UNUSED) norm_ptrs_dungeon(struct dungeon *d_dungeon UNUSED)
{ {
} }
void void
normalize_pointers_ebones(struct ebones *d_ebones UNUSED) norm_ptrs_ebones(struct ebones *d_ebones UNUSED)
{ {
} }
void void
normalize_pointers_edog(struct edog *d_edog UNUSED) norm_ptrs_edog(struct edog *d_edog UNUSED)
{ {
} }
void void
normalize_pointers_egd(struct egd *d_egd UNUSED) norm_ptrs_egd(struct egd *d_egd UNUSED)
{ {
} }
void void
normalize_pointers_emin(struct emin *d_emin UNUSED) norm_ptrs_emin(struct emin *d_emin UNUSED)
{ {
} }
void void
normalize_pointers_engr(struct engr *d_engr UNUSED) norm_ptrs_engr(struct engr *d_engr UNUSED)
{ {
} }
void void
normalize_pointers_epri(struct epri *d_epri UNUSED) norm_ptrs_epri(struct epri *d_epri UNUSED)
{ {
} }
void void
normalize_pointers_eshk(struct eshk *d_eshk UNUSED) norm_ptrs_eshk(struct eshk *d_eshk UNUSED)
{ {
} }
void void
normalize_pointers_fakecorridor(struct fakecorridor *d_fakecorridor UNUSED) norm_ptrs_fakecorridor(struct fakecorridor *d_fakecorridor UNUSED)
{ {
} }
void void
normalize_pointers_fe(struct fe *d_fe UNUSED) norm_ptrs_fe(struct fe *d_fe UNUSED)
{ {
} }
void void
normalize_pointers_flag(struct flag *d_flag UNUSED) norm_ptrs_flag(struct flag *d_flag UNUSED)
{ {
} }
void void
normalize_pointers_fruit(struct fruit *d_fruit UNUSED) norm_ptrs_fruit(struct fruit *d_fruit UNUSED)
{ {
} }
void void
normalize_pointers_gamelog_line(struct gamelog_line *d_gamelog_line UNUSED) norm_ptrs_gamelog_line(struct gamelog_line *d_gamelog_line UNUSED)
{ {
} }
void void
normalize_pointers_kinfo(struct kinfo *d_kinfo UNUSED) norm_ptrs_kinfo(struct kinfo *d_kinfo UNUSED)
{ {
} }
void void
normalize_pointers_levelflags(struct levelflags *d_levelflags UNUSED) norm_ptrs_levelflags(struct levelflags *d_levelflags UNUSED)
{ {
} }
void void
normalize_pointers_linfo(struct linfo *d_linfo UNUSED) norm_ptrs_linfo(struct linfo *d_linfo UNUSED)
{ {
} }
void void
normalize_pointers_ls_t(struct ls_t *d_ls_t UNUSED) norm_ptrs_ls_t(struct ls_t *d_ls_t UNUSED)
{ {
} }
void void
normalize_pointers_mapseen_feat(struct mapseen_feat *d_mapseen_feat UNUSED) norm_ptrs_mapseen_feat(struct mapseen_feat *d_mapseen_feat UNUSED)
{ {
} }
void void
normalize_pointers_mapseen_flags(struct mapseen_flags *d_mapseen_flags UNUSED) norm_ptrs_mapseen_flags(struct mapseen_flags *d_mapseen_flags UNUSED)
{ {
} }
void void
normalize_pointers_mapseen_rooms(struct mapseen_rooms *d_mapseen_rooms UNUSED) norm_ptrs_mapseen_rooms(struct mapseen_rooms *d_mapseen_rooms UNUSED)
{ {
} }
void void
normalize_pointers_mapseen(struct mapseen *d_mapseen UNUSED) norm_ptrs_mapseen(struct mapseen *d_mapseen UNUSED)
{ {
} }
void void
normalize_pointers_mextra(struct mextra *d_mextra UNUSED) norm_ptrs_mextra(struct mextra *d_mextra UNUSED)
{ {
} }
void void
normalize_pointers_mkroom(struct mkroom *d_mkroom UNUSED) norm_ptrs_mkroom(struct mkroom *d_mkroom UNUSED)
{ {
} }
void void
normalize_pointers_monst(struct monst *d_monst UNUSED) norm_ptrs_monst(struct monst *d_monst UNUSED)
{ {
} }
void void
normalize_pointers_mvitals(struct mvitals *d_mvitals UNUSED) norm_ptrs_mvitals(struct mvitals *d_mvitals UNUSED)
{ {
} }
void void
normalize_pointers_nhcoord(struct nhcoord *d_nhcoord UNUSED) norm_ptrs_nhcoord(struct nhcoord *d_nhcoord UNUSED)
{ {
} }
void void
normalize_pointers_nhrect(struct nhrect *d_nhrect UNUSED) norm_ptrs_nhrect(struct nhrect *d_nhrect UNUSED)
{ {
} }
void void
normalize_pointers_novel_tracking(struct novel_tracking *d_novel_tracking UNUSED) norm_ptrs_novel_tracking(struct novel_tracking *d_novel_tracking UNUSED)
{ {
} }
void void
normalize_pointers_obj(struct obj *d_obj UNUSED) norm_ptrs_obj(struct obj *d_obj UNUSED)
{ {
} }
void void
normalize_pointers_objclass(struct objclass *d_objclass UNUSED) norm_ptrs_objclass(struct objclass *d_objclass UNUSED)
{ {
} }
void void
normalize_pointers_oextra(struct oextra *d_oextra UNUSED) norm_ptrs_oextra(struct oextra *d_oextra UNUSED)
{ {
} }
void void
normalize_pointers_prop(struct prop *d_prop UNUSED) norm_ptrs_prop(struct prop *d_prop UNUSED)
{ {
} }
void void
normalize_pointers_q_score(struct q_score *d_q_score UNUSED) norm_ptrs_q_score(struct q_score *d_q_score UNUSED)
{ {
} }
void void
normalize_pointers_rm(struct rm *d_rm UNUSED) norm_ptrs_rm(struct rm *d_rm UNUSED)
{ {
} }
void void
normalize_pointers_s_level(struct s_level *d_s_level UNUSED) norm_ptrs_s_level(struct s_level *d_s_level UNUSED)
{ {
} }
void void
normalize_pointers_skills(struct skills *d_skills UNUSED) norm_ptrs_skills(struct skills *d_skills UNUSED)
{ {
} }
void void
normalize_pointers_spell(struct spell *d_spell UNUSED) norm_ptrs_spell(struct spell *d_spell UNUSED)
{ {
} }
void void
normalize_pointers_stairway(struct stairway *d_stairway UNUSED) norm_ptrs_stairway(struct stairway *d_stairway UNUSED)
{ {
} }
void void
normalize_pointers_trap(struct trap *d_trap UNUSED) norm_ptrs_trap(struct trap *d_trap UNUSED)
{ {
} }
void void
normalize_pointers_u_conduct(struct u_conduct *d_u_conduct UNUSED) norm_ptrs_u_conduct(struct u_conduct *d_u_conduct UNUSED)
{ {
} }
void void
normalize_pointers_u_event(struct u_event *d_u_event UNUSED) norm_ptrs_u_event(struct u_event *d_u_event UNUSED)
{ {
} }
void void
normalize_pointers_u_have(struct u_have *d_u_have UNUSED) norm_ptrs_u_have(struct u_have *d_u_have UNUSED)
{ {
} }
void void
normalize_pointers_u_realtime(struct u_realtime *d_u_realtime UNUSED) norm_ptrs_u_realtime(struct u_realtime *d_u_realtime UNUSED)
{ {
} }
void void
normalize_pointers_u_roleplay(struct u_roleplay *d_u_roleplay UNUSED) norm_ptrs_u_roleplay(struct u_roleplay *d_u_roleplay UNUSED)
{ {
} }
void void
normalize_pointers_version_info(struct version_info *d_version_info UNUSED) norm_ptrs_version_info(struct version_info *d_version_info UNUSED)
{ {
} }
void void
normalize_pointers_vlaunchinfo(union vlaunchinfo *d_vlaunchinfo UNUSED) norm_ptrs_vlaunchinfo(union vlaunchinfo *d_vlaunchinfo UNUSED)
{ {
} }
void void
normalize_pointers_vptrs(union vptrs *d_vptrs UNUSED) norm_ptrs_vptrs(union vptrs *d_vptrs UNUSED)
{ {
} }
void void
normalize_pointers_you(struct you *d_you UNUSED) norm_ptrs_you(struct you *d_you UNUSED)
{ {
} }
#endif /* SFCTOOL */ #endif /* SFCTOOL */

6
src/sfstruct.c
View File

@@ -53,7 +53,7 @@ void historical_sfi_##dtyp(NHFILE *nhfp, dtyp *d_##dtyp,
#define SFO_CBODY(dt) \ #define SFO_CBODY(dt) \
{ \ { \
normalize_pointers_##dt(d_##dt); \ norm_ptrs_##dt(d_##dt); \
bwrite(nhfp->fd, (genericptr_t) d_##dt, sizeof *d_##dt); \ bwrite(nhfp->fd, (genericptr_t) d_##dt, sizeof *d_##dt); \
} }
@@ -63,7 +63,7 @@ void historical_sfi_##dtyp(NHFILE *nhfp, dtyp *d_##dtyp,
sfstruct_read_error(); \ sfstruct_read_error(); \
} \ } \
mread(nhfp->fd, (genericptr_t) d_##dt, sizeof *d_##dt); \ mread(nhfp->fd, (genericptr_t) d_##dt, sizeof *d_##dt); \
normalize_pointers_##dt(d_##dt); \ norm_ptrs_##dt(d_##dt); \
if (restoreinfo.mread_flags == -1) \ if (restoreinfo.mread_flags == -1) \
nhfp->eof = TRUE; \ nhfp->eof = TRUE; \
} }
@@ -73,7 +73,7 @@ void historical_sfo_##dtyp(NHFILE *, keyw dtyp *d_##dtyp,
const char *); \ const char *); \
void historical_sfi_##dtyp(NHFILE *, keyw dtyp *d_##dtyp, \ void historical_sfi_##dtyp(NHFILE *, keyw dtyp *d_##dtyp, \
const char *); \ const char *); \
extern void normalize_pointers_##dtyp(keyw dtyp *d_##dtyp); \ extern void norm_ptrs_##dtyp(keyw dtyp *d_##dtyp); \
\ \
void historical_sfo_##dtyp(NHFILE *nhfp, keyw dtyp *d_##dtyp, \ void historical_sfo_##dtyp(NHFILE *nhfp, keyw dtyp *d_##dtyp, \
const char *myname UNUSED) \ const char *myname UNUSED) \

8
sys/vms/Makefile_src.vms
View File

@@ -114,10 +114,10 @@ HACK_H = $(addsuffix .h, $(addprefix $(INCL), $(CONFIGBASEH) $(HACKBASEH)))
# all .c that are part of the main NetHack program and are not # all .c that are part of the main NetHack program and are not
# operating-system or windowing-system specific. # operating-system or windowing-system specific.
# Do not include date.c in this list. # Do not include date.c in this list.
HACKFILES := allmain alloc apply artifact attrib ball bones \ HACKFILES := allmain alloc apply artifact attrib ball bones botl \
botl calendar cmd coloratt dbridge decl detect dig display dlb do \ calendar cfgfiles cmd coloratt dbridge decl detect \
do_name do_wear dog dogmove dokick dothrow drawing \ dig display dlb do do_name do_wear dog dogmove dokick \
dungeon eat end engrave exper explode extralev \ dothrow drawing dungeon eat end engrave exper explode extralev \
files fountain getpos glyphs hack hacklib insight invent isaac64 \ files fountain getpos glyphs hack hacklib insight invent isaac64 \
light lock mail makemon mcastu mdlib mhitm mhitu minion mklev \ light lock mail makemon mcastu mdlib mhitm mhitu minion mklev \
mkmap mkmaze mkobj mkroom mon \ mkmap mkmaze mkobj mkroom mon \

21
sys/vms/Makefile_utl.vms
View File

@@ -113,7 +113,7 @@ ODATE = $(OBJDIR)date.obj
MAKEOBJS = []makedefs.obj $(OMONOBJ) $(ODATE) $(OALLOC) $(OPANIC) MAKEOBJS = []makedefs.obj $(OMONOBJ) $(ODATE) $(OALLOC) $(OPANIC)
# object files for recovery utility # object files for recovery utility
RECOVOBJS = $(TARGETPFX)recover.obj RECOVOBJS = $(TARGETPFX)recover.obj $(TARGETPFX)recover_ver.obj
# object files for the data librarian # object files for the data librarian
DLBOBJS = dlb_main.obj $(OBJDIR)dlb.obj $(OALLOC) $(OPANIC) DLBOBJS = dlb_main.obj $(OBJDIR)dlb.obj $(OALLOC) $(OPANIC)
@@ -140,9 +140,9 @@ $(HACKLIB): $(HACKLIBOBJS) [-.util]panic.obj
# dependencies for makedefs # dependencies for makedefs
# #
makedefs.exe: $(HACKLIB) $(MAKEOBJS) placeholder.obj mdgrep.h makedefs.exe: $(HACKLIB) $(MAKEOBJS) uplaceholder.obj mdgrep.h
$(CLINK) $(LFLAGS) /EXE=$@ \ $(CLINK) $(LFLAGS) /EXE=$@ \
$(addsuffix $(comma),$(MAKEOBJS)) placeholder.obj, \ $(addsuffix $(comma),$(MAKEOBJS)) uplaceholder.obj, \
$(HACKLIB)/lib $(HACKLIB)/lib
# note: the headers listed here are maintained manually rather than via # note: the headers listed here are maintained manually rather than via
@@ -158,10 +158,10 @@ makedefs.obj: makedefs.c $(SRC)mdlib.c $(CONFIG_H) \
$(INCL)dlb.h $(INCL)patchlevel.h mdgrep.h $(INCL)dlb.h $(INCL)patchlevel.h mdgrep.h
$(CC) $(CFLAGS) $(CSTD) makedefs.c /OBJ=$@ $(CC) $(CFLAGS) $(CSTD) makedefs.c /OBJ=$@
placeholder.c: uplaceholder.c:
echo int makedefs_placeholder = 1; >$@ echo int uplaceholder = 1; >$@
placeholder.obj: placeholder.c uplaceholder.obj: uplaceholder.c
# Don't require perl to build; that is why mdgrep.h is spelled wrong below. # Don't require perl to build; that is why mdgrep.h is spelled wrong below.
@@ -193,13 +193,18 @@ panic.obj: panic.c $(CONFIG_H)
# #
# dependencies for recover # dependencies for recover
# #
$(TARGETPFX)recover.exe: $(HACKLIB) $(RECOVOBJS) $(TARGETPFX)recover.exe: $(HACKLIB) $(RECOVOBJS) uplaceholder.obj
$(TARGET_CLINK) $(TARGET_LFLAGS) /EXE=$@ \ $(TARGET_CLINK) $(TARGET_LFLAGS) /EXE=$@ \
$(RECOVOBJS),$(HACKLIB)/lib $(LIBS) $(addsuffix $(comma),$(RECOVOBJS)) uplaceholder.obj, \
$(HACKLIB)/lib $(LIBS)
$(TARGETPFX)recover.obj: recover.c $(CONFIG_H) $(TARGETPFX)recover.obj: recover.c $(CONFIG_H)
$(TARGET_CC) $(TARGET_CFLAGS) $(CSTD) recover.c /OBJ=$@ $(TARGET_CC) $(TARGET_CFLAGS) $(CSTD) recover.c /OBJ=$@
$(TARGETPFX)recover_ver.obj: [-.src]version.c $(HACK_H)
$(TARGET_CC) $(TARGET_CFLAGS) $(CSTD) \
/DEFINE=(MINIMAL_FOR_RECOVER) \
[-.src]version.c /OBJ=$@
# dependencies for dlb # dependencies for dlb
# #

2
sys/vms/vmsmain.c
View File

@@ -81,7 +81,7 @@ main(int argc, char *argv[])
if (argcheck(argc, argv, ARG_SHOWPATHS) == 2) { if (argcheck(argc, argv, ARG_SHOWPATHS) == 2) {
gd.deferred_showpaths = TRUE; gd.deferred_showpaths = TRUE;
return; return 0;
} }
if (argcheck(argc, argv, ARG_DEBUG) == 1) { if (argcheck(argc, argv, ARG_DEBUG) == 1) {
argc--; argc--;

2
sys/vms/vmstty.c
View File

@@ -459,7 +459,7 @@ void
settty(const char *s) settty(const char *s)
{ {
if (!bombing) if (!bombing)
end_screen(); term_end_screen();
if (s) if (s)
raw_print(s); raw_print(s);
if (settty_needed) { if (settty_needed) {