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-05-26 19:02:43 -04:00
parent 3a027289ed 175b0b1960
commit ced7ebafec
9 changed files with 276 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
README
View File

@@ -4,20 +4,23 @@ NetHack 3.6 is an enhancement to the dungeon exploration game NetHack,
which is a distant descendent of Rogue and Hack, and a direct descendent of
NetHack 3.4 as there was no NetHack 3.5 release.
NetHack 3.6.2 contains a collection of more than 15 bug fixes to NetHack 3.6.1.
The file doc/fixes36.2 in the source distribution has a full list of them. The
text in there was written for the development team's own use and is provided
"as is", so please do not ask us to further explain the entries in that file.
Some entries might be considered "spoilers", particularly in the "new features"
section.
NetHack 3.6.2 is being released as a collection of a couple of dozen bug fixes
committed since the release of 3.6.1. The file doc/fixes36.2 in the source
distribution has a full list of the bug fixes. The text in there was written
for the development team's own use and is provided "as is", so please do not
ask us to further explain the entries in that file. Some entries might be
considered "spoilers", particularly in the "new features" section.
Below you will find some other general notes that were not considered
spoilers:
* Performance optimizations with tty including the ability to do per field
updating
* sys/winnt/nttty performance improvements mainly through the introduction
of a back buffer approach
* a couple of windows crash bug fixes
* Significant performance optimizations for tty including the ability to
do per field updating
* Significant performance improvements in sys/winnt/nttty mainly through
the introduction of a back buffer approach
* a couple of windows crash bug fixes during early game startup
* Ensuring that unix Makefiles do not rely on features unique to gnu make
* Improvements to hilite_status parsing in an effort to ensure that all
expected and sensible values ranges are more easily specified and accepted
- - - - - - - - - - -

23
dat/history
View File

@@ -212,13 +212,28 @@ and Integrity (aka Itanium aka IA64) but not VAX.
Ray Chason resurrected the msdos port for 3.6.1 and contributed the
necessary updates to the community at large.
Shortly after the release of 3.6.1, reports of some display performance
issues on some platforms began to emerge. With the help of some members
of the NetHack community, those issues were tracked down and resolved.
The display performance fixes were combined with a couple of dozen
other bug fixes and released as NetHack 3.6.2 in late May 2018.
The development team at the time of release of 3.6.2 consisted of
Warwick Allison, Michael Allison, Ken Arromdee, David Cohrs,
Jessie Collet, Pasi Kallinen, Ken Lorber, Dean Luick, Patric Mueller,
Pat Rankin, Derek S. Ray, Alex Smith, Mike Stephenson, Janet Walz,
and Paul Winner.
The official NetHack web site is maintained by Ken Lorber at
http://www.nethack.org/.
On behalf of the NetHack community, thank you very much once again to
M. Drew Streib, Pasi Kallinen and Robin Bandy for providing public
NetHack servers at nethack.alt.org and devnull.net and/or for hosting annual
NetHack tournaments.
SPECIAL THANKS:
On behalf of the NetHack community, thank you very much once again to M.
Drew Streib and Pasi Kallinen for providing a public NetHack server at
nethack.alt.org. Thanks to Keith Simpson and Andy Thomson for
hardfought.org. Thanks to all those unnamed dungeoneers who invest their
time and effort into annual NetHack tournaments such as Junehack and in
days past, devnull.net (gone for now, but not forgotten).
- - - - - - - - - -

19
doc/Guidebook.mn
View File

@@ -21,7 +21,7 @@
.ds vr "NetHack 3.6
.ds f0 "\*(vr
.ds f1
.ds f2 "May 16, 2018
.ds f2 "May 26, 2018
.
.\" labeled paragraph start (should be part of tmac.n, but I don't want to
.\" make changes to that file)
@@ -3729,7 +3729,7 @@ For example, the following line in your config file will cause
the hitpoints field to display in the color red if your hitpoints
drop to or below a threshold of 30%:
.si
.lp "OPTION=hilite_status: hitpoints/<30%/red/normal"
.lp "OPTION=hilite_status: hitpoints/<=30%/red/normal"
.ei
.pg
For another example, the following line in your config file will cause
@@ -4516,13 +4516,26 @@ and Integrity (aka Itanium aka IA64) but not VAX.
\fBRay Chason\fP resurrected the msdos port for 3.6.1 and contributed the
necessary updates to the community at large.
.pg
Shortly after the release of 3.6.1, reports of some display performance
issues on some platforms began to emerge. With the help of some members
of the NetHack community, those issues were tracked down and resolved.
The display performance fixes were combined with a couple of dozen
other bug fixes and released as NetHack 3.6.2 in late May 2018.
.pg
The development team at the time of release of 3.6.2 consisted of
\fBWarwick Allison\fP, \fBMichael Allison\fP, \fBKen Arromdee\fP,
\fBDavid Cohrs\fP, \fBJessie Collet\fP, \fBPasi Kallinen\fP,
\fBKen Lorber\fP, \fBDean Luick\fP, \fBPatric Mueller\fP,
\fBPat Rankin\fP, \fBDerek S. Ray\fP, \fBAlex Smith\fP,
\fBMike Stephenson\fP, \fBJanet Walz\fP, and \fBPaul Winner\fP.
.pg
The official NetHack web site is maintained by \fBKen Lorber\fP at http://www.nethack.org/.
.pg
.hn 2
SPECIAL THANKS
.pg
On behalf of the NetHack community, thank you very much once
again to \fBM. Drew Streib\fP, \fBPasi Kallinen\fP for providing a
again to \fBM. Drew Streib\fP and \fBPasi Kallinen\fP for providing a
public NetHack server at nethack.alt.org. Thanks to \fBKeith Simpson\fP
and \fBAndy Thomson\fP for hardfought.org. Thanks to all those
unnamed dungeoneers who invest their time and effort into annual

25
doc/Guidebook.tex
View File

@@ -45,7 +45,7 @@
%.au
\author{Original version - Eric S. Raymond\\
(Edited and expanded for 3.6 by Mike Stephenson and others)}
\date{May 16, 2018}
\date{May 26, 2018}
\maketitle
@@ -4351,7 +4351,7 @@ For example, the following line in your config file will cause
the hitpoints field to display in the color red if your hitpoints
drop to or below a threshold of 30%:
\begin{verbatim}
OPTION=hilite_status: hitpoints/<30%/red/normal
OPTION=hilite_status: hitpoints/<=30%/red/normal
\end{verbatim}
%.pg
For another example, the following line in your config file will cause
@@ -5283,6 +5283,25 @@ and Integrity (aka Itanium aka IA64) but not VAX.
{\it Ray Chason} resurrected the msdos port for 3.6.1 and contributed the
necessary updates to the community at large.
%.pg
\medskip
Shortly after the release of 3.6.1, reports of some display
performance issues on some platforms began to emerge. With the help of
some members of the {\it NetHack\/} community, those issues were
tracked down and resolved. The display performance fixes were combined
with a couple of dozen other bug fixes and released as
{\it NetHack\/} 3.6.2 in late May 2018.
%.pg
\medskip
The development team at the time of release of 3.6.2 consisted of
{\it Warwick Allison}, {\it Michael Allison}, {\it Ken Arromdee},
{\it David Cohrs}, {\it Jessie Collet},
{\it Pasi Kallinen}, {\it Ken Lorber}, {\it Dean Luick},
{\it Patric Mueller}, {\it Pat Rankin}, {\it Derek S. Ray},
{\it Alex Smith}, {\it Mike Stephenson}, {\it Janet Walz}, and
{\it Paul Winner}.
%.pg
\medskip
\nd The official {\it NetHack\/} web site is maintained by {\it Ken Lorber} at
@@ -5297,7 +5316,7 @@ http:{\tt /}{\tt /}www.nethack.org{\tt /}.
\subsection*{Special Thanks}
\nd On behalf of the {\it NetHack\/} community, thank you very much once
again to {\it M. Drew Streib}, {\it Pasi Kallinen} for providing a
again to {\it M. Drew Streib} and {\it Pasi Kallinen} for providing a
public NetHack server at nethack.alt.org. Thanks to {\it Keith Simpson}
and {\it Andy Thomson} for hardfought.org. Thanks to all those
unnamed dungeoneers who invest their time and effort into annual

264
doc/Guidebook.txt
View File

@@ -126,7 +126,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -192,7 +192,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -258,7 +258,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -324,7 +324,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -390,7 +390,7 @@
friendly creatures. The lower this number is, the more
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -456,7 +456,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -522,7 +522,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -588,7 +588,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -654,7 +654,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -720,7 +720,7 @@
mouse support, the command is also invoked when a mouse-
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -786,7 +786,7 @@
scrolls, and so on), shop status (`u' for unpaid, in other
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -852,7 +852,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -918,7 +918,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -984,7 +984,7 @@
cept an item of armor and attempt to wear it.)
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1050,7 +1050,7 @@
(R)UNIX is a registered trademark of The Open Group.
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1116,7 +1116,7 @@
enter a count prior to its letter.
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1182,7 +1182,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1248,7 +1248,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1314,7 +1314,7 @@
and 'M-N'.
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1380,7 +1380,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1446,7 +1446,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1512,7 +1512,7 @@
Throw something. Default key is 't'.
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1578,7 +1578,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1644,7 +1644,7 @@
Show locations of special levels. Autocompletes. Wizard-mode
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1710,7 +1710,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1776,7 +1776,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1842,7 +1842,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1908,7 +1908,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -1974,7 +1974,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2040,7 +2040,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2106,7 +2106,7 @@
of that object to your load. The amount that you can carry
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2172,7 +2172,7 @@
as uncursed. They could just as easily have been described as
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2238,7 +2238,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2304,7 +2304,7 @@
and still hit a target is not an easy task. Rangers are among
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2370,7 +2370,7 @@
you feel more confident in your skills. At that point you can
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2436,7 +2436,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2502,7 +2502,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2568,7 +2568,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2634,7 +2634,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2700,7 +2700,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2766,7 +2766,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2832,7 +2832,7 @@
fungi (`F') are also considered to be vegetable matter. Certain
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2898,7 +2898,7 @@
of item; or fight with your hands and feet.
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -2964,7 +2964,7 @@
ux, and Mac OS X it is ``.nethackrc'' in the user's home
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3030,7 +3030,7 @@
Defaults to HACKDIR, must be writeable.
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3096,7 +3096,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3162,7 +3162,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3228,7 +3228,7 @@
(fire) command with an empty quiver (or quiver sack or have
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3294,7 +3294,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3360,7 +3360,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3426,7 +3426,7 @@
aren't interrupted with the ``More info?'' prompt, but it also
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3492,7 +3492,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3558,7 +3558,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3624,7 +3624,7 @@
Set your character's name (defaults to your user name). You
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3690,7 +3690,7 @@
instead of accepting any non-yes response as no
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3756,7 +3756,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3822,7 +3822,7 @@
screen on the rogue level.
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3888,7 +3888,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -3954,7 +3954,7 @@
Put the ending display in a NetHack window instead of on stdout
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4020,7 +4020,7 @@
target. (default off)
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4086,7 +4086,7 @@
map window.
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4152,7 +4152,7 @@
If NetHack can, it should pop up dialog boxes for input.
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4218,7 +4218,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4284,7 +4284,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4350,7 +4350,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4416,7 +4416,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4482,7 +4482,7 @@
When asked for a location, the key to go to previous closest
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4548,7 +4548,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4614,7 +4614,7 @@
Prefix key to run towards a direction without picking up items
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4680,7 +4680,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4746,7 +4746,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4784,7 +4784,7 @@
cause the hitpoints field to display in the color red if your
hitpoints drop to or below a threshold of 30%:
OPTION=hilite_status: hitpoints/<30%/red/normal
OPTION=hilite_status: hitpoints/<=30%/red/normal
For another example, the following line in your config file
will cause wisdom to be displayed red if it drops and green if it
@@ -4812,7 +4812,7 @@
tion flags: stone, slime, strngl, foodpois, termill, blind,
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4878,7 +4878,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -4944,7 +4944,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5010,7 +5010,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5076,7 +5076,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5142,7 +5142,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5208,7 +5208,7 @@
Load a symbol set for the rogue level that is appropriate for
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5274,7 +5274,7 @@
a game in wizard mode.
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5340,7 +5340,7 @@
%D - current time, YYYYMMDDhhmmss format
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5406,7 +5406,7 @@
playmode:debug option.
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5472,7 +5472,7 @@
code for PC NetHack 3.0. Johnny Lee ported NetHack 3.0 to the
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5538,7 +5538,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5604,7 +5604,7 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5670,7 +5670,7 @@
Walz, and Paul Winner. In early 2015, ahead of the release of
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5721,22 +5721,22 @@
Ray Chason resurrected the msdos port for 3.6.1 and contrib-
uted the necessary updates to the community at large.
The official NetHack web site is maintained by Ken Lorber at
http://www.nethack.org/.
Shortly after the release of 3.6.1, reports of some display
performance issues on some platforms began to emerge. With the
help of some members of the NetHack community, those issues were
tracked down and resolved. The display performance fixes were
combined with a couple of dozen other bug fixes and released as
NetHack 3.6.2 in late May 2018.
12.1. SPECIAL THANKS
On behalf of the NetHack community, thank you very much once
again to M. Drew Streib, Pasi Kallinen and Robin Bandy for pro-
viding public NetHack servers at nethack.alt.org and devnull.net
and/or for hosting annual NetHack tournaments.
- - - - - - - - - -
The development team at the time of release of 3.6.2 con-
sisted of Warwick Allison, Michael Allison, Ken Arromdee, David
Cohrs, Jessie Collet, Pasi Kallinen, Ken Lorber, Dean Luick,
Patric Mueller, Pat Rankin, Derek S. Ray, Alex Smith, Mike
Stephenson, Janet Walz, and Paul Winner.
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018
@@ -5746,6 +5746,21 @@
The official NetHack web site is maintained by Ken Lorber at
http://www.nethack.org/.
12.1. SPECIAL THANKS
On behalf of the NetHack community, thank you very much once
again to M. Drew Streib and Pasi Kallinen for providing a public
NetHack server at nethack.alt.org. Thanks to Keith Simpson and
Andy Thomson for hardfought.org. Thanks to all those unnamed dun-
geoneers who invest their time and effort into annual NetHack
tournaments such as Junehack and in days past, devnull.net (gone
for now, but not forgotten).
- - - - - - - - - -
From time to time, some depraved individual out there in
netland sends a particularly intriguing modification to help out
with the game. The Gods of the Dungeon sometimes make note of
@@ -5784,6 +5799,19 @@
Erik Andersen Matthew Day Steve Linhart
Frederick Roeber Merlyn LeRoy Steve VanDevender
Gil Neiger Michael Allison Teemu Suikki
NetHack 3.6 May 26, 2018
NetHack Guidebook 89
Greg Laskin Michael Feir Tim Lennan
Greg Olson Michael Hamel Timo Hakulinen
Gregg Wonderly Michael Sokolov Tom Almy
@@ -5802,7 +5830,45 @@
NetHack 3.6 May 16, 2018
NetHack 3.6 May 26, 2018

2
include/global.h
View File

@@ -8,8 +8,10 @@
#include <stdio.h>
/* #define BETA */ /* development or beta testing [MRS] */
#define BETA /* development or beta testing [MRS] */
/* #define DEBUG */
#define DEBUG
/*

19
include/patchlevel.h
View File

@@ -33,17 +33,20 @@
*/
#define VERSION_COMPATIBILITY 0x03060002L
/****************************************************************************/
/* Version 3.7.x */
/*
* NetHack 3.7.0, <insert date>
*
*/
/****************************************************************************/
/* Version 3.6.x */
/* Patch 2, May 26, 2018
* Performance optimizations for tty including the ability to
* do per field updating
* Significant performance improvements in sys/winnt/nttty mainly through
* the introduction of a back buffer approach
* A couple of windows crash bug fixes during early game startup
* Ensuring that unix Makefiles do not rely on features unique to gnu make
* Improvements to hilite_status parsing in an effort to ensure that expected
* and sensible values ranges are more easily specified and accepted
*/
/* Patch 1, April 27, 2018
* Over four hundred and seventy bug fixes and improvements.
*/

57
sys/msdos/setup.bat
View File

@@ -31,17 +31,13 @@ if exist ..\..\dat\data~1.bas goto long1b
goto err_long
:long1a
echo Changing some long-named distribution file names:
echo "Copying ..\..\dat\data.base -> ..\..\dat\data.bas"
copy ..\..\dat\data.base ..\..\dat\data.bas
if exist ..\..\dat\data.old del /Q ..\..\dat\data.old
ren ..\..\dat\data.base data.old
echo "Renaming ..\..\dat\data.base -> ..\..\dat\data.bas"
ren ..\..\dat\data.base data.bas
goto long1ok
:long1b
echo Changing some long-named distribution file names:
echo "Copying ..\..\dat\data~1.bas -> ..\..\dat\data.bas"
copy ..\..\dat\data~1.bas ..\..\dat\data.bas
if exist ..\..\dat\data.old del /Q ..\..\dat\data.old
ren ..\..\dat\data~1.bas data.old
echo "Renaming ..\..\dat\data~1.bas -> ..\..\dat\data.bas"
ren ..\..\dat\data~1.bas data.bas
:long1ok
if exist ..\..\include\patchlev.h goto long2ok
@@ -49,22 +45,12 @@ if exist ..\..\include\patchlevel.h goto long2a
if exist ..\..\include\patchl~1.h goto long2b
goto err_long
:long2a
echo "Copying ..\..\include\patchlevel.h -> ..\..\include\patchlev.h"
copy ..\..\include\patchlevel.h ..\..\include\patchlev.h
if exist ..\..\include\patchlev.old del /Q ..\..\include\patchlev.old
ren ..\..\include\patchlevel.h patchlev.old
echo "Renaming ..\..\include\patchlevel.h -> ..\..\include\patchlev.h"
ren ..\..\include\patchlevel.h patchlev.h
goto long2ok
:long2b
echo "Copying ..\..\include\patchl~1.h -> ..\..\include\patchlev.h"
copy ..\..\include\patchl~1.h ..\..\include\patchlev.h
if exist ..\..\include\patchlev.old del /Q ..\..\include\patchlev.old
ren ..\..\include\patchl~1.h patchlev.old
:long2c
echo "Copying ..\..\sys\share\pmatch~1.c -> ..\..\sys\share\pmatchre.c"
copy ..\..\sys\share\pmatch~1.c ..\..\sys\share\pmatchre.c
:long2d
echo "Copying ..\..\sys\share\posixr~1.c -> ..\..\sys\share\posixreg.c"
copy ..\..\sys\share\posixr~1.c ..\..\sys\share\posixreg.c
echo "Renaming ..\..\include\patchl~1.h -> ..\..\include\patchlev.h"
ren ..\..\include\patchl~1.h patchlev.h
:long2ok
REM Missing guidebook is not fatal to the build process
@@ -73,22 +59,31 @@ if exist ..\..\doc\guidebook.txt goto long3a
if exist ..\..\doc\guideb~1.txt goto long3b
goto warn3long
:long3a
echo "Copying ..\..\doc\guidebook.txt -> ..\..\doc\guideboo.txt"
copy ..\..\doc\guidebook.txt ..\..\doc\guideboo.txt
if exist ..\..\doc\guideboo.old del /Q ..\..\doc\guideboo.old
ren ..\..\doc\guidebook.txt guideboo.old
echo "Copying ..\..\doc\guidebook.txt -> ..\..\doc\guidebk.txt"
ren ..\..\doc\guidebook.txt guidebk.txt
goto long3ok
:long3b
echo "Copying ..\..\doc\guideb~1.txt -> ..\..\doc\guideboo.txt"
copy ..\..\doc\guideb~1.txt ..\..\doc\guideboo.txt
if exist ..\..\doc\guideboo.old del /Q ..\..\doc\guideboo.old
ren ..\..\doc\guideb~1.txt guideboo.old
echo "Copying ..\..\doc\guideb~1.txt -> ..\..\doc\guidebk.txt"
ren ..\..\doc\guideb~1.txt guidebk.txt
goto long3ok
:warn3long
echo "Warning - There is no NetHack Guidebook (..\..\doc\guideboo.txt)"
echo "Warning - There is no NetHack Guidebook (..\..\doc\guidebk.txt)"
echo " included in your distribution. Build will proceed anyway."
:long3ok
if exist ..\..\sys\share\posixreg.c goto long4ok
if exist ..\..\sys\share\posixregex.c goto long4a
if exist ..\..\sys\share\posixr~1.c goto long4b
goto err_long
:long4a
echo "Renaming ..\..\sys\share\posixregex.c -> ..\..\sys\share\posixreg.c"
ren ..\..\sys\share\posixregex.c posixreg.c
goto long4ok
:long4b
echo "Renaming ..\..\sys\share\posixr~1.c -> ..\..\sys\share\posixreg.c"
ren ..\..\sys\share\posixr~1.h posixreg.c
:long4ok
if "%1"=="GCC" goto ok_gcc
if "%1"=="gcc" goto ok_gcc
if "%1"=="nmake" goto ok_msc

2
sys/share/pcsys.c
View File

@@ -555,8 +555,8 @@ msexit()
if (GUILaunched)
getreturn("to end");
synch_cursor();
#endif
getreturn_enabled = TRUE;
#endif
wait_synch();
return;
}