Commit Graph
9398 Commits
Author SHA1 Message Date
nhmall a259d03460 Windows Makefile catch-up bits 2019-11-02 22:33:34 -04:00
Bart House 11018da6b8 Renamed configuration file for windows to .nethackrc.
Also adjusted name of template files populated during windows builds.
2019-11-02 19:11:26 -07:00
Bart House 2b73494296 Updated guidebook to discuss new loc and name of configuration file on win. 2019-11-02 18:18:48 -07:00
Bart House 4ab976d6fd Renamed defaults.nh to .nethackrc for windows. 2019-11-02 18:18:02 -07:00
Bart House 2b9e6a057b Removed the redundant #if definded(MSDOS). 2019-11-02 18:17:10 -07:00
PatR 2c1edc860c couple of Guidebook.tex bits
More symbols:  I left out a word on the continutation line for S_stone
and S_tool has been forcing narrow space where ordinary <comma><space>
was intended.
2019-11-02 17:15:54 -07:00
Bart House 9e309ab37a Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-02 16:57:57 -07:00
Bart House ee1817f4ec Updates to fixes36.3 for recent work. 2019-11-02 16:57:43 -07:00
PatR d7354fe78c Guidebook.tex catch up, Guideboon.mn bits
Guidebook.tex not tested.  The \, in the continuation of S_stone is
a narrow space in LaTeX.  It should be \hspace{ width of '(' } but
I don't remember how to measure something in LaTeX or TeX.

Guidebook.mn is getting two small changes:  I forgot about the
guideline that each sentence be on its own line.  Also, this adds the
fix for wide lines in the dungeoneers list although the reordering
accompanying a recent change might have made that moot (unless some
future reordering puts wide names on the same line again, assuming
that was the issue).
2019-11-02 16:05:39 -07:00
Bart House 3a315a7c76 Make type Win10 and gWin10 local to win10.c module. 2019-11-02 12:10:13 -07:00
Bart House 0bbedb2933 Fix cut and paste error in output string. 2019-11-02 11:51:20 -07:00
Bart House 4e11038871 Merge branch 'NetHack-3.6' 2019-11-02 11:40:19 -07:00
Bart House 33149eed0e Move is_desktop_bridge() api to win10 wrapper. 2019-11-02 11:39:11 -07:00
nhmall 28a4c65caa Merge branch 'NetHack-3.6' 2019-11-02 12:12:59 -04:00
nhmall 91a8522871 Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-02 09:32:22 -04:00
nhmall 35fc46e3eb missing constants on mingw build fix
Errors seen during build:
o/windmain.o:windmain.c:(.rdata$.refptr.FOLDERID_ProgramData[.refptr.FOLDERID_ProgramData]+0x0): undefined reference to `FOLDERID_ProgramData'
o/windmain.o:windmain.c:(.rdata$.refptr.FOLDERID_LocalAppData[.refptr.FOLDERID_LocalAppData]+0x0): undefined reference to `FOLDERID_LocalAppData'
o/windmain.o:windmain.c:(.rdata$.refptr.FOLDERID_Profile[.refptr.FOLDERID_Profile]+0x0): undefined reference to `FOLDERID_Profile'
collect2.exe: error: ld returned 1 exit status
mingw32-make: *** [Makefile:849: ../binary/NetHack.exe] Error 1

DEFINE_KNOWN_FOLDER is using this particular definition in the mingw
header files:

rather than this one:

So, the known folder values that recent code is using such as
FOLDERID_ProgramData, FOLDERID_LocalAppData, and FOLDERID_Profile are
being declared as external constants.

That is why the error is a link error. We need to include -luuid on
the link command line because those external constants are defined
in uuid.lib.
2019-11-02 09:23:34 -04:00
PatR c66eb915d2 Guidebook.mn Symbols section
The table listing symset entries was ok for ps/pdf output but for
plain text output it was wrapping to a second line for S_xan,
S_pet_override, and S_player_override and also going past the right
margin for some others.  I've shortened the text for those three
and narrowed the first column to give more room for the third column,
bringing all the lines within their margin.

The entry for S_stone was rather surprising:  "dark part of a room".
It now says "solid rock or unexplored terrain or dark part of a room"
and needed to span two lines.

The first column has been labeled "Default" but that was why that
column was wider than necessary.  It now has a label of two spaces
and is left justified instead of being centered.  It is also now
forcing constant-width Roman as the font and every character in that
column should be the same size so one reason for centering is removed.

The title used to be centered but always looked a bit off due to the
fact that the three columns have differing widths and/or because of
the over-wide lines changing the location of "center".  It is now
left justified and looks a little bit like it's labeling the first
column.  Perhaps it needs a blank line separating it from the rest.

Guidebook.tex is lagging again.
2019-11-02 03:32:35 -07:00
Pasi Kallinen 4c9f4dbbd9 Prevent leashing monsters with no extremities
... and also unsolid monsters.
2019-11-02 11:40:37 +02:00
nhmall 6d385661c0 Merge branch 'NetHack-3.6' 2019-11-02 01:58:32 -04:00
nhmall 13f4a466d9 name correction 2019-11-02 01:44:00 -04:00
nhmall f261b02f5a dungeoneers update 2019-11-02 01:40:58 -04:00
nhmall 3587d8aee9 bump Windows supported version in mingw-w64 sys/winnt/Makefile.gcc
mingw-w64 sys/winnt/Makefile.gcc required a Windows version bump from
0x0501 to 0x0601 (XP level to Windows 7 level) during compile in
order for the mingw system header files to include some of the
needed support for recent Windows port changes.
2019-11-02 01:03:02 -04:00
nhmall 527208f729 Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-01 16:33:30 -04:00
nhmall 4b163e3d55 Revert "quiet a mingw warning"
This reverts commit e33dfed456.
2019-11-01 16:33:04 -04:00
Pasi Kallinen 54024f2015 Fix pet polyed to long worm staying leashed
Long worms cannot be leashed, but polymorphing a leashed pet
into a long worm kept it leashed.
2019-11-01 19:05:48 +02:00
nhmall 6de0f7a939 Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-01 12:49:15 -04:00
nhmall 2f260541d9 more doc updates and tweaks 2019-11-01 12:48:09 -04:00
Bart House d9d47c120b Merge branch 'NetHack-3.6' 2019-10-31 20:46:54 -07:00
Bart House 34cf17c4d0 New package submitted to microsoft store. 2019-10-31 20:37:43 -07:00
Bart House a57cff45ce Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-10-31 20:18:41 -07:00
Bart House 215815c0b5 Changes to player selection dialog support to respond to per-monitor DPI. 2019-10-31 20:18:27 -07:00
nhmall e33dfed456 quiet a mingw warning 2019-10-31 19:43:59 -04:00
nhmall 5d5a4610ff try to improve some reported TeX Guidebook to pdf results 2019-10-31 19:22:05 -04:00
nhmall 696f54a3b8 doc updates 2019-10-31 13:27:10 -04:00
nhmall ac49d7b5e8 unintentional change 2019-10-31 12:50:12 -04:00
nhmall 6f7246bdc3 Guidebook.tex fix 2019-10-31 12:46:33 -04:00
nhmall b377771849 Merge branch 'NetHack-3.6' 2019-10-31 12:26:27 -04:00
nhmall 919765f67f Windows: link with ole32.lib and shell32.lib 2019-10-31 12:16:03 -04:00
nhmall b110ee9eaf msdos build fix following recent files.c change 2019-10-31 12:00:59 -04:00
PatR 7cc59eb929 fix #H9374 - initial rendering of guardian angel
Creation of guardian angel bypasses tamedog() and marks it tame
directly but it wasn't updating the map after changing the monster.
So if 'hilite_pet' was On when entering the Astral Plane level, the
angel appeared to be ordinary monster rather than a tame one until
it moved or the screen was redrawn.  Also, the message about it
appearing was issued before marking it tame, so a tiny bit of code
reordering has been done to get the sequence correct.
2019-10-31 06:57:16 -07:00
PatR eb825a2da5 catch Guidebook.tex up with Guidebook.mn
Only with the past couple of changes, not a complete reconciliation.

Not tested.
2019-10-31 05:31:39 -07:00
Bart House ded40818f1 Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-10-30 19:17:20 -07:00
Bart House 86473526b8 Save a copy of the symbols file to symbols.save when updating. 2019-10-30 19:17:03 -07:00
PatR 384f98b61f Guidebook tweak
This sample comment attending the sample SYMBOLS statement fit ok in
the pdf output but wrapped to another line in the plain text output,
so shorten it.

S_xan, S_pet_override, and S_player_override still wrap, but by a bit
less than before.  Their width causes the line of dashes at the top
of the table to wrap too.

Guidebook.tex is still lagging behind.
2019-10-30 17:37:04 -07:00
nhmall 61fe703331 Merge branch 'NetHack-3.6' 2019-10-30 20:22:48 -04:00
nhw_cron 7f867c098b This is cron-daily v1-Oct-30-2019. files updated: Files 2019-10-30 20:20:54 -04:00
nhw_cron 4f1a13147d This is cron-daily v1-Oct-30-2019. guidebook updated: doc/Guidebook.txt 2019-10-30 20:20:20 -04:00
nhmall 33d00cf0e4 attempt to get mingw building correctly after recent changes
make typedef of boolean match mingw header files
link with shell32 and ole32 as Makefile.msc now had to do
kludge some stuff missing from mingw headers in sys/winnt/windmain.c
2019-10-30 18:48:28 -04:00
nhmall b6d2697a6a function didn't match prototype 2019-10-30 18:40:48 -04:00
nhmall 2eab66617d Merge branch 'NetHack-3.6' 2019-10-30 13:21:20 -04:00