diff -Naurd ../nethack-3.4.0/sys/vms/Install.vms ./sys/vms/Install.vms --- ../nethack-3.4.0/sys/vms/Install.vms Wed Mar 20 23:43:56 2002 +++ ./sys/vms/Install.vms Mon Feb 24 15:25:05 2003 @@ -1,5 +1,5 @@ - Instructions for Installing NetHack 3.4.0 - on a VMS system + Instructions for Installing NetHack 3.4.1 + on a VMS (aka OpenVMS) system ========================================= 0. Please read this entire file before trying to build or install @@ -7,7 +7,7 @@ 1. Building NetHack requires a C compiler (either Compaq C, DEC C, VAX C, or GNU C) and VMS version V4.6 or later (but see note #9). - This release has been tested with Compaq C V6.4 on Alpha/VMS V7.1 + This release has been tested with Compaq C V6.4 on Alpha/VMS V7.1 and with VAX C V3.2 and GNU C 2.7.1 on VAX/VMS V5.5-2. The build procedure (vmsbuild.com) should not need to be modified; it accepts an option for selecting the compiler, and it can detect different @@ -43,12 +43,13 @@ [.sys .os2] -- OS/2 [.sys .share .sounds] -- AIFF format audio files [.sys .unix] -- guess :-) + [.sys .wince] -- Windows CE [.sys .winnt] -- Windows NT [.win .gem] -- window routines for Atari/GEM [.win .gnome] -- window routines for Unix/GNOME [.win .Qt] -- window routines for Qt [.win .share] -- "tile" graphic support - [.win .win32] -- Windows NT + [.win .win32] -- Windows NT and Windows CE [.win .X11] -- window routines for X-Windows; requires X11R4 or later and MIT's Athena Widget set You must arrange things in this structure or the supplied procedures @@ -57,10 +58,7 @@ work as intended if they're moved elsewhere. The file called Files in the top directory contains lists of everything that should be in each subdirectory, including things that are constructed as NetHack - is being built. (If you obtain the NetHack distribution via the - "shar" packaging used for Usenet newsgroup comp.sources.games and its - archives, you may have to reconstruct several files that get split - for posting.) + is being built. 3. Prior to beginning compilation, go to the [.include] subdirectory and edit vmsconf.h according to its comments. You should set Local_WIZARD @@ -136,9 +134,10 @@ Notes: -1. Save files and bones files from earlier versions will not work with - 3.4.0. The scoreboard file (RECORD) from 3.3.x will work; one from - version 3.2.x is slightly different format but should be compatible. +1. Save files and bones files from versions 3.4.0 will work with 3.4.1; + those from earlier versions will not. The scoreboard file (RECORD) + from 3.4.0 or 3.3.x will also work; one from version 3.2.x is + slightly different format but should be compatible. 2. To specify user-preference options in your environment, define the logical name NETHACKOPTIONS to have the value of a quoted string @@ -343,7 +342,7 @@ as ^X and ^O for wizard mode debugging) to be used as commands without being intercepted or interpreted by the terminal driver. The code which parses arrow and function keys is not perfect, and it's possible - to get strange results if you hold such keys down to just type too + to get strange results if you hold such keys down or just type too quickly, particularly on slow multiplexor lines. Those keys are never needed in actual play, and most function keys are just treated as for use in aborting partial commands. @@ -396,7 +395,7 @@ spoil the game with unlimited wishes--you must be running from the username compiled into the game via Local_WIZARD in vmsconf.h, and you must specify "-D" on the command line when invoking NetHack. - Note that it must be uppercase, and it must be in quotes to prevent + Note that -D must be uppercase, and it must be in quotes to prevent the C run-time library's program startup code from converting it into lowercase. $ @hackdir:nethack "-D" @@ -470,11 +469,9 @@ window manager in order for any changes to take effect; it's easiest to just make the session manager quit and then log in again. -14. There is no support for VMS POSIX in this release of NetHack. - -15. If necessary, send problem reports via e-mail to +14. If necessary, send problem reports via e-mail to Always include version information for NetHack, the operating system, and the C compiler used. - 3-AUG-2000 +10-FEB-2003 diff -Naurd ../nethack-3.4.0/sys/vms/Makefile.src ./sys/vms/Makefile.src --- ../nethack-3.4.0/sys/vms/Makefile.src Wed Mar 20 23:43:57 2002 +++ ./sys/vms/Makefile.src Mon Feb 24 15:25:05 2003 @@ -1,5 +1,5 @@ # NetHack Makefile (VMS) - for building nethack itself. -# SCCS Id: @(#)Makefile.src 3.4 2002/03/02 +# SCCS Id: @(#)Makefile.src 3.4 2003/02/13 # Copy this file to [.src]Makefile. and then edit it as needed. # The default configuration is for building with DEC C (aka Compaq C). @@ -90,9 +90,7 @@ # Other things that have to be reconfigured are in vmsconf.h, # and config.h -# note: no trailing whitespace (or comment) after version or patchlevel numbers -VERSION =3.4 -PATCHLVL =0 +VERSION = 3.4.1 MAKEDEFS = $(UTL)makedefs.exe; @@ -196,7 +194,7 @@ @ write f f$edit("$(HOBJ5)","COLLAPSE") @ write f f$edit("$(HOBJ6)","COLLAPSE") @ write f "iosegment=128" - write f "identification=$(VERSION).$(PATCHLVL)" + write f "identification=$(VERSION)" close f # linker options file for run-time libraries, also used by $(UTL)Makefile @@ -295,8 +293,8 @@ $(INC)coord.h $(INC)vmsconf.h $(INC)system.h \ $(INC)unixconf.h $(INC)os2conf.h $(INC)micro.h \ $(INC)pcconf.h $(INC)tosconf.h $(INC)amiconf.h \ - $(INC)macconf.h $(INC)beconf.h $(INC)ntconf.h \ - $(INC)nhlan.h + $(INC)macconf.h $(INC)beconf.h $(INC)wceconf.h \ + $(INC)ntconf.h $(INC)nhlan.h $(TOUCH) $(CONFIG_H) # hack.h timestamp $(HACK_H) : $(INC)hack.h $(CONFIG_H) $(INC)align.h \ @@ -309,7 +307,7 @@ $(INC)you.h $(INC)attrib.h $(INC)monst.h $(INC)skills.h \ $(INC)onames.h $(INC)timeout.h $(INC)trap.h \ $(INC)flag.h $(INC)rm.h $(INC)vision.h \ - $(INC)display.h $(INC)engrave.h $(INC)rect.h $(inc)region.h \ + $(INC)display.h $(INC)engrave.h $(INC)rect.h $(INC)region.h \ $(INC)winprocs.h $(INC)wintty.h $(INC)trampoli.h $(TOUCH) $(HACK_H) # VMS-specific code @@ -344,7 +342,7 @@ winmisc.obj : $(X11)winmisc.c $(HACK_H) $(INC)func_tab.h $(INC)winX.h winstat.obj : $(X11)winstat.c $(HACK_H) $(INC)winX.h wintext.obj : $(X11)wintext.c $(HACK_H) $(INC)winX.h $(INC)xwindow.h -winval.obj : $(X11)winval.c $(CONFIG_H) $(INC)winX.h +winval.obj : $(X11)winval.c $(HACK_H) $(INC)winX.h tile.obj : $(SRC)tile.c $(HACK_H) monstr.obj : monstr.c $(CONFIG_H) vis_tab.obj : vis_tab.c $(CONFIG_H) $(INC)vis_tab.h @@ -353,7 +351,7 @@ alloc.obj : alloc.c $(CONFIG_H) apply.obj : apply.c $(HACK_H) $(INC)edog.h artifact.obj : artifact.c $(HACK_H) $(INC)artifact.h $(INC)artilist.h -attrib.obj : attrib.c $(HACK_H) $(INC)artifact.h +attrib.obj : attrib.c $(HACK_H) ball.obj : ball.c $(HACK_H) bones.obj : bones.c $(HACK_H) $(INC)lev.h botl.obj : botl.c $(HACK_H) @@ -383,7 +381,7 @@ fountain.obj : fountain.c $(HACK_H) hack.obj : hack.c $(HACK_H) hacklib.obj : hacklib.c $(HACK_H) -invent.obj : invent.c $(HACK_H) $(INC)artifact.h +invent.obj : invent.c $(HACK_H) light.obj : light.c $(HACK_H) $(INC)lev.h lock.obj : lock.c $(HACK_H) mail.obj : mail.c $(HACK_H) $(INC)mail.h @@ -396,11 +394,12 @@ mklev.obj : mklev.c $(HACK_H) mkmap.obj : mkmap.c $(HACK_H) $(INC)sp_lev.h mkmaze.obj : mkmaze.c $(HACK_H) $(INC)sp_lev.h $(INC)lev.h -mkobj.obj : mkobj.c $(HACK_H) $(INC)artifact.h +mkobj.obj : mkobj.c $(HACK_H) mkroom.obj : mkroom.c $(HACK_H) mon.obj : mon.c $(HACK_H) $(INC)mfndpos.h $(INC)edog.h mondata.obj : mondata.c $(HACK_H) $(INC)eshk.h $(INC)epri.h -monmove.obj : monmove.c $(HACK_H) $(INC)mfndpos.h $(INC)artifact.h +monmove.obj : monmove.c $(HACK_H) $(INC)mfndpos.h $(INC)artifact.h \ + $(INC)epri.h monst.obj : monst.c $(CONFIG_H) $(INC)permonst.h $(INC)align.h \ $(INC)monattk.h $(INC)monflag.h $(INC)monsym.h \ $(INC)dungeon.h $(INC)eshk.h $(INC)vault.h \ @@ -456,7 +455,7 @@ were.obj : were.c $(HACK_H) wield.obj : wield.c $(HACK_H) windows.obj : windows.c $(HACK_H) $(INC)wingem.h $(INC)winGnome.h -wizard.obj : wizard.c $(HACK_H) $(INC)qtext.h +wizard.obj : wizard.c $(HACK_H) $(INC)qtext.h $(INC)epri.h worm.obj : worm.c $(HACK_H) $(INC)lev.h worn.obj : worn.c $(HACK_H) write.obj : write.c $(HACK_H) diff -Naurd ../nethack-3.4.0/sys/vms/vmsbuild.com ./sys/vms/vmsbuild.com --- ../nethack-3.4.0/sys/vms/vmsbuild.com Wed Mar 20 23:43:59 2002 +++ ./sys/vms/vmsbuild.com Mon Feb 24 15:25:05 2003 @@ -1,5 +1,5 @@ $ ! vms/vmsbuild.com -- compile and link NetHack 3.4.* [pr] -$ version_number = "3.4.0" +$ version_number = "3.4.1" $ ! $ ! usage: $ ! $ set default [.src] !or [-.-.src] if starting from [.sys.vms] diff -Naurd ../nethack-3.4.0/sys/vms/vmstty.c ./sys/vms/vmstty.c --- ../nethack-3.4.0/sys/vms/vmstty.c Wed Mar 20 23:44:00 2002 +++ ./sys/vms/vmstty.c Mon Feb 24 15:25:05 2003 @@ -477,5 +477,9 @@ Vprintf(s,VA_ARGS); (void) putchar('\n'); VA_END(); +#ifndef SAVE_ON_FATAL_ERROR + /* prevent vmsmain's exit handler byebye() from calling hangup() */ + (void)signal(SIGHUP, SIG_DFL); +#endif exit(EXIT_FAILURE); }