]> granicus.if.org Git - nethack/log
nethack
5 years agokinda/sorta fix github issue #246
PatR [Thu, 5 Dec 2019 10:33:47 +0000 (02:33 -0800)]
kinda/sorta fix github issue #246

Cherry-pick 3.7.0's 565e020573d56afb3eefafa4e8975d24b677c80d.  Again,
conflict because the fixes entry goes into a different file.

When picking up from floor or removing from container fails because
there aren't any inventory slots available, pickup/take-out stops.
But the message
|Your knapsack can't accomodate any more items.
is inaccurate if there is gold beyond the stopping point.  Actually
continuing in order to pickup/take-out gold would require substantial
changes, but varying the message to be
|Your knapsack can't accomodate any more items (except gold).
when stopping is a one line fix.  The parenthesized remark is only
added if there is actually some gold after the current object and is
given regardless of whether autopickup happens to be targetting it.

Fixes #246

5 years agoallow teleport onto the vibrating square
PatR [Fri, 13 Dec 2019 23:58:56 +0000 (15:58 -0800)]
allow teleport onto the vibrating square

Cherry-pick 3.7.0's 4a3d5f95d9e724a77cb94ff885b333c8c1c70b0d
(github pull request #252).  Slightly tricky because the fix entry
nowgoes into a different file.  fixes37.0 will need fixing up.

5 years agopolymorphed steed phrasing
PatR [Fri, 13 Dec 2019 22:01:28 +0000 (14:01 -0800)]
polymorphed steed phrasing

When you ride your steed into a polymorph trap and it changes into a
creature that can still wear the saddle, the message is
|You have to adjust youself in the saddle on <foo>.
which sounds as if the game is telling the player that he or she needs
to do something.  Simplify it to
|You adjust yourself in the saddle on <foo>.

5 years agocomment typo
PatR [Thu, 12 Dec 2019 20:16:50 +0000 (12:16 -0800)]
comment typo

5 years agospelling and typo fixes
PatR [Wed, 11 Dec 2019 20:35:45 +0000 (12:35 -0800)]
spelling and typo fixes

Submitted for 3.7.0; all but one also apply to 3.6.3.

I rewrote the curses terminal-too-small message instead of just
fixing the spelling of "minumum".

5 years agoThis is cron-daily v1-Dec-2-2019. files updated: Files
nhw_cron [Sat, 7 Dec 2019 02:02:36 +0000 (21:02 -0500)]
This is cron-daily v1-Dec-2-2019.  files updated: Files

5 years agoarticle fix for polymorphing steed
nhmall [Fri, 6 Dec 2019 22:50:59 +0000 (17:50 -0500)]
article fix for polymorphing steed

5 years agomake this branch recognizable for post-3.6.3 patch commits and patch tests
nhmall [Fri, 6 Dec 2019 21:35:47 +0000 (16:35 -0500)]
make this branch recognizable for post-3.6.3 patch commits and patch tests

5 years agoPANICTRACE memory leak
PatR [Fri, 6 Dec 2019 20:59:18 +0000 (12:59 -0800)]
PANICTRACE memory leak

Changing from BETA to RELEASED resulted in turning off PANICTRACE
and that exposed a minor memory leak.  Only applies to program exit
so doesn't impact play.

5 years agoanother bit NetHack-3.6.3_Released
nhmall [Thu, 5 Dec 2019 23:24:04 +0000 (18:24 -0500)]
another bit

5 years agoREADME bit
nhmall [Thu, 5 Dec 2019 23:18:17 +0000 (18:18 -0500)]
README bit

5 years agoThis is cron-daily v1-Dec-2-2019. guidebook updated: doc/Guidebook.txt
nhw_cron [Thu, 5 Dec 2019 23:04:18 +0000 (18:04 -0500)]
This is cron-daily v1-Dec-2-2019.  guidebook updated: doc/Guidebook.txt

5 years agoMerge branch 'stuff-to-merge-at-3.6.3-release' into NetHack-3.6
nhmall [Thu, 5 Dec 2019 21:38:10 +0000 (16:38 -0500)]
Merge branch 'stuff-to-merge-at-3.6.3-release' into NetHack-3.6

5 years agomore self-recover prompting cleanup (tty)
nhmall [Wed, 4 Dec 2019 18:10:12 +0000 (13:10 -0500)]
more self-recover prompting cleanup (tty)

5 years agohttp to https
nhmall [Wed, 4 Dec 2019 17:26:10 +0000 (12:26 -0500)]
http to https

5 years agomore prep bits
nhmall [Wed, 4 Dec 2019 16:51:24 +0000 (11:51 -0500)]
more prep bits

5 years agomore prep work
nhmall [Wed, 4 Dec 2019 16:46:15 +0000 (11:46 -0500)]
more prep work

5 years agodoc updates for release
nhmall [Wed, 4 Dec 2019 16:36:01 +0000 (11:36 -0500)]
doc updates for release

5 years agoremove conflicting prototype declared for getlock in ntconf.h with mingw build
nhmall [Wed, 4 Dec 2019 09:46:41 +0000 (04:46 -0500)]
remove conflicting prototype declared for getlock in ntconf.h with mingw build

5 years agofix self-recover prompting on windows
nhmall [Wed, 4 Dec 2019 04:32:12 +0000 (23:32 -0500)]
fix self-recover prompting on windows

the prompting on Windows wasn't working correctly if a prior game had crashed
and the self-recover feature was trying to kick in. This impacts tty, curses,
and mswin (GUI).

5 years agoadd code support to make keypad behave better with swap_yz option
nhmall [Tue, 3 Dec 2019 03:55:48 +0000 (22:55 -0500)]
add code support to make keypad behave better with swap_yz option

This is being committed commented out in include/ntconf.h.

5 years agoREADME update Dec 2
nhmall [Mon, 2 Dec 2019 17:05:18 +0000 (12:05 -0500)]
README update Dec 2

5 years agoThis is cron-daily v1-Dec-1-2019. guidebook updated: doc/Guidebook.txt
nhw_cron [Mon, 2 Dec 2019 12:21:09 +0000 (07:21 -0500)]
This is cron-daily v1-Dec-1-2019.  guidebook updated: doc/Guidebook.txt

5 years agoThis is cron-daily v1-Dec-1-2019. files updated: Files
nhw_cron [Mon, 2 Dec 2019 12:21:03 +0000 (07:21 -0500)]
This is cron-daily v1-Dec-1-2019.  files updated: Files

5 years agofollow-up bit
nhmall [Mon, 2 Dec 2019 00:11:12 +0000 (19:11 -0500)]
follow-up bit

5 years agoupdate and/or clarify some version references
nhmall [Mon, 2 Dec 2019 00:07:28 +0000 (19:07 -0500)]
update and/or clarify some version references

5 years agocomment bit
PatR [Sun, 1 Dec 2019 15:38:01 +0000 (07:38 -0800)]
comment bit

'ick' comment was from there were multiple "You finish taking off..,"
strings that only varied by one word.  That was replaced last night.

5 years agofix #H9479 - worn dented pot can't be taken off
PatR [Sun, 1 Dec 2019 04:19:10 +0000 (20:19 -0800)]
fix #H9479 - worn dented pot can't be taken off

Taking off no-delay helmets, gloves, and boots were unintentionally
taking off suit instead and stayed worn themselves.  As far as I
saw, only helmet types "fedora" and "dented pot" were applicable;
all gloves and boots have a small multi-turn delay.  This was an
unintended side-effect of the first "slippery gloves" commit so
happened about three weeks ago.

5 years agoyet-another has_color
nhmall [Sun, 1 Dec 2019 03:20:03 +0000 (22:20 -0500)]
yet-another has_color

5 years agoleave option setting as previous (it was not part of the change)
nhmall [Sat, 30 Nov 2019 20:51:58 +0000 (15:51 -0500)]
leave option setting as previous (it was not part of the change)

5 years agoone more win_proc
nhmall [Sat, 30 Nov 2019 20:27:04 +0000 (15:27 -0500)]
one more win_proc

5 years agobuild with TEXTCOLOR undef'd turned up a couple of things
nhmall [Sat, 30 Nov 2019 20:05:48 +0000 (15:05 -0500)]
build with TEXTCOLOR undef'd turned up a couple of things

Also, one more has_color in obsolete sys/mac folder. Adjusted code.

5 years agosome dead code eliminations and a couple of documentation updates
nhmall [Sat, 30 Nov 2019 18:35:14 +0000 (13:35 -0500)]
some dead code eliminations and a couple of documentation updates

5 years agohas_color() performance fixes
nhmall [Sat, 30 Nov 2019 16:44:07 +0000 (11:44 -0500)]
has_color() performance fixes

Performance profiling showed that multiple strcmpi() calls were
occurring each and every time a character was going to the map.

This update:
- honors the WC_COLOR capability
- It allows a window-port to control individual color availability should the window-port wish to do so.
- Makes checking on the individual colors for the active window-port is a straightforward table lookup at the CLR_ offset.

iflags.use_color remains a master on/off switch for use of color, regardless of the capability
compiled into the game (default TRUE).

The has_color() routine, which is now a shared routine in src/windows.c, could likely be made
into a simple macro to eliminate the function call, but this update does not go that far.

This hits a lot of port files due to the window-port interface change, mostly cookie-cutter.

5 years agofix teetering typo
PatR [Fri, 29 Nov 2019 19:38:42 +0000 (11:38 -0800)]
fix teetering typo

do.c:1005:54: warning: address of function 'uescaped_shaft' will always
      evaluate to 'true' [-Wpointer-bool-conversion]
        if (trap && (uteetering_at_seen_pit(trap) || uescaped_shaft)) {
                                                  ~~ ^~~~~~~~~~~~~~

5 years agomove fixes entry to correct section
nhmall [Fri, 29 Nov 2019 17:05:21 +0000 (12:05 -0500)]
move fixes entry to correct section

5 years agomore things considered when you're on the brink
nhmall [Fri, 29 Nov 2019 16:14:55 +0000 (11:14 -0500)]
more things considered when you're on the brink

5 years agoThis is cron-daily v1-Nov-24-2019. guidebook updated: doc/Guidebook.txt
nhw_cron [Thu, 28 Nov 2019 17:17:54 +0000 (12:17 -0500)]
This is cron-daily v1-Nov-24-2019.  guidebook updated: doc/Guidebook.txt

5 years agoparanoid_confirmation:eating
PatR [Thu, 28 Nov 2019 00:27:13 +0000 (16:27 -0800)]
paranoid_confirmation:eating

Add 'eating' (synonym 'continue') to the list of things that can be
set via paranoid_confirmation to require "yes" instead of "y" when
the user is prompted about something, in this case "Continue eating?".

dat/opthelp was missing a few of the paranoid_confirmation choices.

5 years agountested curses number pad fix
PatR [Wed, 27 Nov 2019 23:19:52 +0000 (15:19 -0800)]
untested curses number pad fix

This compiles ok but I don't have a number pad to test it with.

5 years agonumber pad changes from pull request #247
nhmall [Wed, 27 Nov 2019 22:19:55 +0000 (17:19 -0500)]
number pad changes from pull request #247

Below is the accompanying text from the pull request on
GitHub https://github.com/NetHack/NetHack/pull/247:

> This fixes the issue brought up in https://www.reddit.com/r/nethack/comments/dv3pae/curses_and_the_numberpad/?st=k3hgply6&sh=dbc2bf7d .
>
> I don't know why the "regular" (tty) method doesn't seem to work for him,
> but I'm going to chalk it up to a PDCurses oddity. What I do know, however,
> is that the alternate method I added a year ago or maybe longer, that allows
> numpad usage even with number_pad:0 (to retain the default keybindings in case
> an user is used to them, while keeping number pad behaviour making sense,
> similar to NetHack4+friends) was only partially implemented, for some reason.
> This adds the rest of the keys, meaning that this means of key interpretation
> should be more realible. KEY_A2/B1/B3/C2 are not standard keys in the Curses
> documentation, and is thus behind an ifdef -- but PDCurses, amongst other
> implementations, makes use of them.
>
> As a side effect, Home/End/PgUp/PgDn are now interpreted as diagonal movement,
> since some terminals interpret number_pad keys that way. I do not consider this
> a problem since they went unused in normal gameplay anyway (This does not
> interfere with menus or similar).

Closes #247

5 years agoMerge branch 'FredrIQ-numpad' into NetHack-3.6
nhmall [Wed, 27 Nov 2019 22:14:15 +0000 (17:14 -0500)]
Merge branch 'FredrIQ-numpad' into NetHack-3.6

5 years agoMerge branch 'NetHack-3.6' of https://github.com/FredrIQ/NetHack into FredrIQ-numpad
nhmall [Wed, 27 Nov 2019 22:04:35 +0000 (17:04 -0500)]
Merge branch 'NetHack-3.6' of https://github.com/FredrIQ/NetHack into FredrIQ-numpad

5 years agofix part of #H9467 - clairvoyance vs sensed mons
PatR [Wed, 27 Nov 2019 19:24:23 +0000 (11:24 -0800)]
fix part of #H9467 - clairvoyance vs sensed mons

When a monster is drawn on the map, remove any "remembered, unseen
monster" glyph being shown at the same spot.  Clairvoyance shows
all monsters in vicinty, then ones which can't be seen are replaced
with the 'I' glyph (which is on the object layer or the display,
not the monster layer show is subject to different update behavior).
But subsequent monster refresh didn't get rid of it when a sensed
monster was displayed over it.  (3.6.1 included a similar fix for
warned-of monsters.)

Also during clairvoyance, don't draw an 'I' at a spot that will
immediately be refreshed with a monster because 'I' clobbers any
remembered object at the same location.

5 years agoignore 3.7 file if present
PatR [Wed, 27 Nov 2019 17:53:40 +0000 (09:53 -0800)]
ignore 3.7 file if present

5 years agoFix alternate number pad interpretation only working for diagonals
Fredrik Ljungdahl [Wed, 27 Nov 2019 15:44:17 +0000 (16:44 +0100)]
Fix alternate number pad interpretation only working for diagonals

This fixes the issue brought up at https://www.reddit.com/r/nethack/comments/dv3pae/curses_and_the_numberpad/?st=k3hgply6&sh=dbc2bf7d .

I don't know why the "regular" (tty) method doesn't seem to work for him,
but I'm going to chalk it up to a PDCurses oddity. What I do know, however,
is that the alternate method I added a year ago or maybe longer, that allows
numpad usage even with number_pad:0 (to retain the default keybindings in case
an user is used to them, while keeping number pad behaviour making sense,
similar to NetHack4+friends) was only partially implemented, for some reason.
This adds the rest of the keys, meaning that this means of key interpretation
should be more realible. KEY_A2/B1/B3/C2 are not standard keys in the Curses
documentation, and is thus behind an ifdef -- but PDCurses, amongst other
implementations, makes use of them.

As a side effect, Home/End/PgUp/PgDn are now interpreted as diagonal movement,
since some terminals interpret number_pad keys that way. I do not consider this
a problem since they went unused in normal gameplay anyway (This does not
interfere with menus or similar).

5 years agoalignment of mimicked or polymorphed altars
PatR [Mon, 25 Nov 2019 23:01:40 +0000 (15:01 -0800)]
alignment of mimicked or polymorphed altars

A reddit thread about an unaligned altar in an aligned temple was
a tipoff that mimics posing as altars didn't have any particular
alignment.  The look-at code was misusing an operloaded field of the
underlying terrain.  Pick an alignment at random when taking on the
appearance of an altar, store it in the mimic's mon->mextra->mcorpsenm
field, and have look-at use that.

Also, dropping a ring of polymorph into a sink can transform it, and
one possible outcome is an altar.  In this case, the alignment is
part of the location's topology, but code setting that up was using
Align2amask(rn2(foo)).  That's a macro which evaluates its argument
more than once.  The first evaluation was effectively a no-op.  If
the second evaluation picked lawful then the result was lawful as
intended.  But if the second picked non-lawful and the third picked
lawful, the result would end up as none-of-the-above (a value of 3
when it needs to be a single-bit mask of 1, 2, or 4).

5 years agofix #H9462 - segfault with levitation boots
PatR [Sun, 24 Nov 2019 23:33:16 +0000 (15:33 -0800)]
fix #H9462 - segfault with levitation boots

This is similar to the helm of opposite alignment case fixed some
time ago.  Deferring the setting of foo->known until an item is fully
worn (because it used to get set earlier but gave away information if
the wear operation was interrupted) didn't take into account that foo
might end up Null in various circumstances.  So Boots_on() needs to
validate uarmf before setting uarmf->known in case putting on boots
of levitation while on a sink caused them to come right back off.

I put similar validation into all foo_on() just in case (as far as
I'm aware, only Boots_on() and Helmet_on() actually need that).

5 years agomore #H9375 - Rider bargethrough
PatR [Sat, 23 Nov 2019 17:28:08 +0000 (09:28 -0800)]
more #H9375 - Rider bargethrough

I think the previous expression would allow moving (via swapping
places) from a pool to solid rock or closed door which was not what
was intended (but moot since there aren't any pools on the Astral
level).  This revised expression does what is intended:  can only
swap to a pool location if already located in/over (the Riders fly?
they should probably be non-breathing) another pool.

5 years agofix #H9375 - unintended Rider corpse suppression
PatR [Sat, 23 Nov 2019 02:16:59 +0000 (18:16 -0800)]
fix #H9375 - unintended Rider corpse suppression

Don't let Riders swap places with something (fog or ooze, perhaps)
located at a closed door spot because if it gets killed there, there
won't be any corpse and it will stop auto-reviving.

Just avoid moving to spots where mondied() won't place a corpse
instead of worrying about whether a bargethrough creature (if there
ever are any besides the Riders) might be able to survive at the
destination (so ignore pass-walls, door-opening, swimming, &c).

5 years agoslash vs backslash Makefile bit
nhmall [Fri, 22 Nov 2019 12:45:43 +0000 (07:45 -0500)]
slash vs backslash Makefile bit

5 years agowhen decl.h changes, ensure windmain is rebuilt
nhmall [Fri, 22 Nov 2019 12:40:17 +0000 (07:40 -0500)]
when decl.h changes, ensure windmain is rebuilt

5 years agodocall fix
PatR [Fri, 22 Nov 2019 10:46:28 +0000 (02:46 -0800)]
docall fix

Noticed while testing something:  hero drank a potion of see invisible
and nearby invisible monster could now be seen--in theory--but I was
asked what to call the potion while the updated map was buffered.  So
I didn't see the invisible monster until after naming the potion.

pline() flushes buffered map updates, but getlin() doesn't.  I didn't
change that, but I've made docall() do so since the updated map may
make a difference in what the player can tell about whatever is being
'called'.

5 years agoMore hallu monsters
Pasi Kallinen [Fri, 22 Nov 2019 07:24:19 +0000 (09:24 +0200)]
More hallu monsters

5 years agofix part of #H9397 - hallucinatory mon names
PatR [Fri, 22 Nov 2019 01:43:55 +0000 (17:43 -0800)]
fix part of #H9397 - hallucinatory mon names

Fix the issue where a hallucinatory monster name which begins with
a slash is having that stripped off as if it was a gendor and/or
personal-name flag.

The main issue was pronouns ignoring hallucination and this doesn't
attempt to address that.

Also, add new hallucinatory name "leathery-winged avian" which has
been lurking for a while.

5 years agoupdate nhusage output on Windows
nhmall [Tue, 19 Nov 2019 00:20:03 +0000 (19:20 -0500)]
update nhusage output on Windows

5 years agoyet more --showpaths (dumplog)
PatR [Mon, 18 Nov 2019 22:28:25 +0000 (14:28 -0800)]
yet more --showpaths (dumplog)

Provide a little more information when dumplog is unavailable.
While testing various permutations, I encountered a couple of
problems with conditionally declared variables.

5 years agotypo in fixes36.3
nhmall [Mon, 18 Nov 2019 21:58:43 +0000 (16:58 -0500)]
typo in fixes36.3

5 years agocatch up on some post-beta1 corrections
nhmall [Mon, 18 Nov 2019 21:56:52 +0000 (16:56 -0500)]
catch up on some post-beta1 corrections

5 years agoMerge branch 'k-sound' into NetHack-3.6
nhmall [Mon, 18 Nov 2019 20:14:55 +0000 (15:14 -0500)]
Merge branch 'k-sound' into NetHack-3.6

5 years agosome further refinements to --showpaths
nhmall [Mon, 18 Nov 2019 20:12:38 +0000 (15:12 -0500)]
some further refinements to --showpaths

The Windows data file path has to be constructed because
Windows defines VERSION_IN_DLB_FILENAME.

Keep the personal configuration file details as the last
information displayed.

5 years agomore tribute: Eric #3, Witches Abroad #10
PatR [Mon, 18 Nov 2019 19:56:45 +0000 (11:56 -0800)]
more tribute: Eric #3, Witches Abroad #10

5 years agoanother tribute typo: The Light Fantastic #11
PatR [Mon, 18 Nov 2019 19:01:26 +0000 (11:01 -0800)]
another tribute typo: The Light Fantastic #11

Another transciption mistake ("to"; the book has "do").

5 years agofurther refine k-sound pluralization
nhmall [Mon, 18 Nov 2019 18:23:13 +0000 (13:23 -0500)]
further refine k-sound pluralization

5 years agoFix double DLB definition in linux hints file
Pasi Kallinen [Mon, 18 Nov 2019 07:16:51 +0000 (09:16 +0200)]
Fix double DLB definition in linux hints file

5 years agoThis is cron-daily v1-Oct-31-2019. guidebook updated: doc/Guidebook.txt NetHack-3.6.3.beta1.2019.11.17
nhw_cron [Mon, 18 Nov 2019 01:23:20 +0000 (20:23 -0500)]
This is cron-daily v1-Oct-31-2019.  guidebook updated: doc/Guidebook.txt

5 years agoThis is cron-daily v1-Oct-31-2019. files updated: Files
nhw_cron [Mon, 18 Nov 2019 01:23:28 +0000 (20:23 -0500)]
This is cron-daily v1-Oct-31-2019.  files updated: Files

5 years agodate bump
nhmall [Mon, 18 Nov 2019 01:19:41 +0000 (20:19 -0500)]
date bump

5 years agomark source tree as beta, previously marked work-in-progress
nhmall [Mon, 18 Nov 2019 01:06:21 +0000 (20:06 -0500)]
mark source tree as beta, previously marked work-in-progress

5 years agoMerge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into...
nhmall [Mon, 18 Nov 2019 00:57:18 +0000 (19:57 -0500)]
Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6

5 years agore-enable ifdef'd out code during code sleuthing a while back
nhmall [Mon, 18 Nov 2019 00:55:50 +0000 (19:55 -0500)]
re-enable ifdef'd out code during code sleuthing a while back

5 years ago'--showpaths' dlb vs non-dlbb
PatR [Mon, 18 Nov 2019 00:45:10 +0000 (16:45 -0800)]
'--showpaths' dlb vs non-dlbb

Have the --showpaths feedback mention whether dlb is in use or not,
and show the container file name(s) when it is.  Users of prebuilt
binaries or who build with a hints file instead of picking and
choosing things in config.h might not know, and vms (if it ever
catches up with --showpaths) uses a different container name from
everybody else ("nh-data.dlb" instead of "nhdat").

5 years agoMerge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into...
nhmall [Mon, 18 Nov 2019 00:15:02 +0000 (19:15 -0500)]
Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6

5 years agoadd some guard code to the Is_*_level macros in dungeon.h
nhmall [Mon, 18 Nov 2019 00:13:23 +0000 (19:13 -0500)]
add some guard code to the Is_*_level macros in dungeon.h

All Is_*_level tests during early startup would test as true until
dungeon_topology was initialized in a new game or restored from
a save file. That could result in some unexpected code paths being
taken.

5 years agogrammar tid
keni [Sun, 17 Nov 2019 23:41:03 +0000 (18:41 -0500)]
grammar tid

5 years agopager warning fix and formatting
PatR [Sun, 17 Nov 2019 17:25:26 +0000 (09:25 -0800)]
pager warning fix and formatting

The mapglyph() change made a variable obsolete but it got left in
(idx = SYM_PET_OVERRIDE...).  Take it out and fix up the formatting
for the block of code that had it.

5 years agosysconf template for windows
nhmall [Sun, 17 Nov 2019 05:16:02 +0000 (00:16 -0500)]
sysconf template for windows

5 years agoMerge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into...
nhmall [Sun, 17 Nov 2019 03:53:53 +0000 (22:53 -0500)]
Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6

5 years agoadd an mgflags parameter to mapglyph() to alter how it behaves internally
nhmall [Sun, 17 Nov 2019 03:49:36 +0000 (22:49 -0500)]
add an mgflags parameter to mapglyph() to alter how it behaves internally

avoid a recent save-value,call,restore-value kludge by adding
an mgflags parameter to mapglyph() to control its behavior

 Changes to be committed:
modified:   doc/window.doc
modified:   include/extern.h
modified:   include/hack.h
modified:   src/detect.c
modified:   src/mapglyph.c
modified:   src/pager.c
modified:   sys/amiga/winfuncs.c
modified:   sys/wince/mhmap.c
modified:   win/Qt/qt_win.cpp
modified:   win/Qt4/qt4map.cpp
modified:   win/X11/winmap.c
modified:   win/curses/cursdial.c
modified:   win/curses/cursinvt.c
modified:   win/curses/cursmain.c
modified:   win/gem/wingem.c
modified:   win/tty/wintty.c
modified:   win/win32/mhmap.c
modified:   win/win32/mswproc.c

5 years agogas cloud fix
PatR [Sun, 17 Nov 2019 02:31:30 +0000 (18:31 -0800)]
gas cloud fix

remove_region() calls newsym() when removing gas clouds, but when
newsym() checked whether it was updating a gas cloud location it
always got a false 'yes' because the region hadn't been removed yet.
Fixing this didn't seem to make any observable difference so it must
be followed fairly rapidly by a full vision recalc.

5 years agorename S_player_override to S_hero_override
PatR [Sat, 16 Nov 2019 22:31:57 +0000 (14:31 -0800)]
rename S_player_override to S_hero_override

5 years agoball&chain reformatting
PatR [Sat, 16 Nov 2019 21:47:21 +0000 (13:47 -0800)]
ball&chain reformatting

This has been sitting around for a while.

5 years agoplace_monster() debugging
PatR [Sat, 16 Nov 2019 21:42:25 +0000 (13:42 -0800)]
place_monster() debugging

Show more information if place_monster() detects something wrong.
I don't know whether it will actually be useful.

5 years agoMerge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into...
nhmall [Sat, 16 Nov 2019 21:40:40 +0000 (16:40 -0500)]
Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6

5 years agopartial fix for #H9430 - gas clouds vs monsters
PatR [Sat, 16 Nov 2019 20:05:05 +0000 (12:05 -0800)]
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.)

5 years agomonsters entering regions
PatR [Sat, 16 Nov 2019 19:46:50 +0000 (11:46 -0800)]
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.

5 years agolikely final pluralization change for today
nhmall [Sat, 16 Nov 2019 19:17:11 +0000 (14:17 -0500)]
likely final pluralization change for today

5 years agocurses lint
PatR [Sat, 16 Nov 2019 18:03:57 +0000 (10:03 -0800)]
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.

5 years agoreinstate bit - gak!
nhmall [Sat, 16 Nov 2019 15:15:55 +0000 (10:15 -0500)]
reinstate bit - gak!

5 years agoRevert "more pluralization"
nhmall [Sat, 16 Nov 2019 15:13:49 +0000 (10:13 -0500)]
Revert "more pluralization"

This reverts commit 6a3dcc6a382f69fbd6fe990e163cc69ddb8ca95e.

5 years agomore pluralization
nhmall [Sat, 16 Nov 2019 15:08:21 +0000 (10:08 -0500)]
more pluralization

5 years agoimprove pluralization on some words ending with a k-sound
nhmall [Sat, 16 Nov 2019 13:27:07 +0000 (08:27 -0500)]
improve pluralization on some words ending with a k-sound

fixes #245

5 years agofix curses compile warning
PatR [Sat, 16 Nov 2019 03:03:11 +0000 (19:03 -0800)]
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.

5 years agohave --showpaths show DUMPLOG file
PatR [Sat, 16 Nov 2019 01:51:20 +0000 (17:51 -0800)]
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).

5 years agofix #H9420 - dipping while blind
PatR [Fri, 15 Nov 2019 20:09:45 +0000 (12:09 -0800)]
fix #H9420 - dipping while blind

Fix several feedback anomalies for dipping into potions.

5 years agohints/macosx10.14 comment
PatR [Fri, 15 Nov 2019 18:12:45 +0000 (10:12 -0800)]
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.

5 years agomore #H9392 - deafness vs music
PatR [Fri, 15 Nov 2019 00:42:53 +0000 (16:42 -0800)]
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.

5 years agoMerge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into...
nhmall [Fri, 15 Nov 2019 00:19:44 +0000 (19:19 -0500)]
Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6

5 years agoheader issues so just remove them for now on msdos *.cross Makefiles
nhmall [Fri, 15 Nov 2019 00:18:49 +0000 (19:18 -0500)]
header issues so just remove them for now on msdos *.cross Makefiles

5 years agomore minor msdos Makefile bits
nhmall [Fri, 15 Nov 2019 00:17:44 +0000 (19:17 -0500)]
more minor msdos Makefile bits