Commit Graph
9988 Commits
Author SHA1 Message Date
nhmall 0bc2cd281c bad merge fix 2019-11-16 17:33:37 -05:00
PatR 2a07924063 rename S_player_override to S_hero_override 2019-11-16 14:31:57 -08:00
nhmall 6aef1f13a1 Merge branch 'NetHack-3.6' 2019-11-16 17:09:44 -05:00
nhmall db52f15101 Merge branch 'NetHack-3.6' 2019-11-16 17:01:49 -05:00
PatR 145ba8ec12 ball&chain reformatting
This has been sitting around for a while.
2019-11-16 13:47:21 -08:00
PatR 2a50fb1845 place_monster() debugging
Show more information if place_monster() detects something wrong.
I don't know whether it will actually be useful.
2019-11-16 13:42:25 -08:00
nhmall 21a1dcd86c Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-16 16:40:40 -05:00
PatR 43e4100dd8 partial fix for #H9430 - gas clouds vs monsters
Don't show the gas cloud glyph at locations where monsters can be
sensed (telepathy, warning, extended detection).  It will work
better when/if vision of gas cloud locations gets fixed.  (Such
clouds behave as the hero can see into them, so warning doesn't
have any unseen monsters to show unless they're unseen for some
reason other than the gas cloud.)
2019-11-16 12:05:05 -08:00
PatR 020825bc73 monsters entering regions
Region processing does a lot of looping--when there are actually
regions present--and calls functions in those loops which do more
looping of their own.  This moves some of the simpler tests so that
they get done sooner and can avoid some of those function calls.
I was hoping that it would speed up the turn cycle on the Plane of
Fire where the spontaneous irregularly shaped fumaroles are composed
of a lot of small regions but I don't think there's any noticeable
difference.

In process of doing that, I discovered a bug (no doubt copy+paste
which escaped an intended update) with monster handling.  The check
for whether a monster is entering a region depends upon whether the
hero is in that same region rather than whether the monster is
already inside.  So a monster can enter a region--or have a moving
one enclose it--with impunity if the hero is already in that region.
Once the hero moves out of it, the monster will finally enter it.
2019-11-16 11:46:50 -08:00
nhmall d74718fc2b likely final pluralization change for today 2019-11-16 14:17:11 -05:00
PatR 4d3828f6ec curses lint
'orient' is the name of an enum defined in wincurs.h so don't use it
as a variable name in cursstat.c.  My compiler didn't complain using
'-Wshadow' but apparently some other one does.

Make the same change in the dead code located in the second half of
that file, plus a couple of formatting tweaks.
2019-11-16 10:03:57 -08:00
nhmall 5b7940ecb5 Merge branch 'NetHack-3.6' 2019-11-16 10:22:52 -05:00
nhmall cdbad827fe reinstate bit - gak! 2019-11-16 10:15:55 -05:00
nhmall 340851ecf5 Revert "more pluralization"
This reverts commit 6a3dcc6a38.
2019-11-16 10:13:49 -05:00
nhmall 6a3dcc6a38 more pluralization 2019-11-16 10:08:21 -05:00
nhmall 8b1c6148f6 improve pluralization on some words ending with a k-sound
fixes #245
2019-11-16 08:27:07 -05:00
nhmall e6b309fbc3 Merge branch 'NetHack-3.6' 2019-11-15 23:06:16 -05:00
nhmall bfb278fd38 Merge branch 'NetHack-3.7' 2019-11-15 22:23:55 -05:00
nhmall 29d378116e fix unplanned perm change 2019-11-15 22:22:19 -05:00
nhmall 4e05c874bf Merge branch 'NetHack-3.7' 2019-11-15 22:13:00 -05:00
nhmall b0d8e86c8c Merge branch 'NetHack-3.6' 2019-11-15 22:12:12 -05:00
PatR 8a7169eda9 fix curses compile warning
From hardfought; latest gcc complains that /* fall through other stuff */
doesn't match its pattern for /* fall through */ comment indicating
that omitted 'break' statement is intentional and one switch case is
deliberately continuing into the code for another.
2019-11-15 19:03:11 -08:00
nhmall 298af2294f quiet some macosx warnings 2019-11-15 21:20:38 -05:00
PatR ae415589e9 have --showpaths show DUMPLOG file
While not a path exactly, the dumplog file isn't placed somewhere
fixed so being able to see where it is placed could be useful.

This cascaded a bit during testing.  Fix one of the warnings from
hardfought (fqn_prefix_names[]).  And a few more that came up with
SYSCF disabled (panictrace_gdb, two unused variables if files.c).
2019-11-15 17:51:20 -08:00
PatR 8d154121ca fix #H9420 - dipping while blind
Fix several feedback anomalies for dipping into potions.
2019-11-15 12:09:45 -08:00
nhmall f319a8ce3f Merge branch 'master' into NetHack-3.7 2019-11-15 13:24:31 -05:00
nhmall f3cb37e7ca Merge branch 'NetHack-3.6' 2019-11-15 13:23:58 -05:00
PatR 304673dcab hints/macosx10.14 comment
A comment in macosx10.14 describing how to create a signed package
had the last sample command wrong.  Fix it now in case that part
carries over to hypothetical--but likely--new macosx10.15 hints.

Also, shorten a couple of wide comment lines in the same area.
2019-11-15 10:12:45 -08:00
nhmall 8bd6ef629a update post-Lua
add lib/ to .gitignore

add optional "make fetch-Lua" step to simplify prerequisite to "make all"
2019-11-15 11:12:00 -05:00
nhmall b7d16efd76 Makefile.msc updates post-Lua integration 2019-11-15 09:51:04 -05:00
nhmall 78b0e5c804 Merge branch 'NetHack-3.7' into paxed-lua-v2-merged 2019-11-14 19:54:51 -05:00
nhmall 475a429459 Merge branch 'NetHack-3.6' 2019-11-14 19:52:33 -05:00
nhmall d2128968fa Merge branch 'NetHack-3.7' into paxed-lua-v2-merged 2019-11-14 19:50:20 -05:00
nhmall 6c97b0f9a1 Merge branch 'NetHack-3.6' 2019-11-14 19:48:57 -05:00
PatR 616e07cde9 more #H9392 - deafness vs music
The report mentioned whistles but I had forgotten all about them by
the time I tried to deal with musical instruments.  Plain whistles
had deaf handling but magic whistles didn't.
2019-11-14 16:42:53 -08:00
nhmall aec4ce0129 Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-14 19:19:44 -05:00
nhmall e0fbd52359 header issues so just remove them for now on msdos *.cross Makefiles 2019-11-14 19:18:49 -05:00
nhmall 61a8ad35f5 more minor msdos Makefile bits 2019-11-14 19:17:44 -05:00
PatR c72795b2dd fix #H9421 - typo in Soul Music #7
Misspelled "genius".  Typo in the transcription, not in the book.
2019-11-14 16:17:15 -08:00
nhmall c5ac90cedb Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-14 19:14:42 -05:00
nhmall 6ea483242e some msdos cross-compile additional notes and a clarification 2019-11-14 19:12:14 -05:00
PatR 5abf64adaf fix #H9424 - mon vs shade damage despite harmless
Monster vs monster non-weapon attack against a shade that failed
due to non-silver and non-blessed hit was inflicting damage.
2019-11-14 15:28:32 -08:00
PatR 501541635a fix #H9426 - curses_procs null stubs 2019-11-14 14:18:59 -08:00
PatR abdec86a3d fix #H9425 - shade_miss target
Fix 'unused' variable by using it as intended.  Thinko brought on by
too many revisions...
2019-11-14 12:56:08 -08:00
nhmall 8e7888d631 introduce msdos build support for cross-compiling on other platforms 2019-11-14 14:10:56 -05:00
keni a3777d6ead Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-14 08:21:12 -05:00
keni 78716ab4bf attempt to fix .BR macro 2019-11-14 08:20:38 -05:00
PatR f3a923d647 fix #H1554, #H1736, github issue #240 - silver )
Fixes #240

Monster versus monster (melee and throwing) didn't handle shades
(need silver or blessed weapon to take damage) or silver feedback
(extra info when silver-haters are hit).

I did a lot of test, revise, re-test but didn't always re-test
everything that had previously been tested, so bugs that I thought
were quashed might have crept in.

Now if a missile weapon "passes harmlessly through the shade" it
will continue on and maybe hit something else.  (Regular misses
still stop at the missed target.)

A couple of minor ball&chain changes accidentally got included.
2019-11-13 15:47:46 -08:00
nhmall 9470138324 Merge branch 'NetHack-3.6' 2019-11-13 01:08:33 -05:00
nhmall 392ddb2fef updates to vmsbuild.com to include lua and new 3.7 files 2019-11-12 23:41:01 -05:00