]> granicus.if.org Git - nethack/log
nethack
5 years agolanding spot for post-3.6.4 patches if needed
nhmall [Wed, 18 Dec 2019 21:49:55 +0000 (16:49 -0500)]
landing spot for post-3.6.4 patches if needed

This is a landing spot.

5 years agopost-release
nhmall [Wed, 18 Dec 2019 21:46:30 +0000 (16:46 -0500)]
post-release

5 years agoupdate version NetHack-3.6.4_Released
nhmall [Wed, 18 Dec 2019 20:29:40 +0000 (15:29 -0500)]
update version

5 years agoREADME bit
nhmall [Wed, 18 Dec 2019 15:01:54 +0000 (10:01 -0500)]
README bit

5 years agoThis is cron-daily v1-Dec-12-2019. guidebook updated: doc/Guidebook.txt
nhw_cron [Wed, 18 Dec 2019 09:17:25 +0000 (04:17 -0500)]
This is cron-daily v1-Dec-12-2019.  guidebook updated: doc/Guidebook.txt

5 years agohousekeeping updates
nhmall [Wed, 18 Dec 2019 04:38:06 +0000 (23:38 -0500)]
housekeeping updates

5 years agoMerge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into...
nhmall [Wed, 18 Dec 2019 04:18:06 +0000 (23:18 -0500)]
Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6

5 years agoupdate and simplify the windows portable_device_paths sysconf option
nhmall [Wed, 18 Dec 2019 04:16:44 +0000 (23:16 -0500)]
update and simplify the windows portable_device_paths sysconf option

Requires a sysconf file in the windows executable directory in order to work

5 years agoceiling hiders vs '>'
PatR [Wed, 18 Dec 2019 03:08:26 +0000 (19:08 -0800)]
ceiling hiders vs '>'

Poly'd hero hiding on the ceiling was told "you can't go down here"
if using '>' at a spot that didn't have down stairs, trap door, hole,
or pit.  Let '>' bring a ceiling hider out of hiding; lurker above
resumes flying, piercer falls to floor or whatever is underneath it.

5 years agowizard mode wishing for terrain
PatR [Wed, 18 Dec 2019 02:14:08 +0000 (18:14 -0800)]
wizard mode wishing for terrain

Fix some issues noticed when experimenting with ceiling hiders.
They're all blind (at least without the monks' Eyes) and some of
the behavior while blind seemed to be incorrect (though some that
I thought was wrong turned out to be ok; feel_newsym() won't update
the map if the hero can't reach the floor).  Fixing that made me
notice that some terrain side-effects (being underwater or stuck in
lava) weren't getting disabled when the underlying terrain wasn't
the corresponding type anymore.

5 years agoceiling_hider()
PatR [Tue, 17 Dec 2019 23:48:37 +0000 (15:48 -0800)]
ceiling_hider()

Just groundwork so far; no change in game play.

5 years agoparse_conf_file fix fix
PatR [Tue, 17 Dec 2019 23:41:58 +0000 (15:41 -0800)]
parse_conf_file fix fix

5 years agoWindows portable_device support: skip the "illegal folder" check for now
nhmall [Tue, 17 Dec 2019 20:32:10 +0000 (15:32 -0500)]
Windows portable_device support: skip the "illegal folder" check for now

5 years agoThis is cron-daily v1-Dec-12-2019. guidebook updated: doc/Guidebook.txt
nhw_cron [Tue, 17 Dec 2019 19:49:36 +0000 (14:49 -0500)]
This is cron-daily v1-Dec-12-2019.  guidebook updated: doc/Guidebook.txt

5 years agoThis is cron-daily v1-Dec-12-2019. files updated: Files
nhw_cron [Tue, 17 Dec 2019 19:49:35 +0000 (14:49 -0500)]
This is cron-daily v1-Dec-12-2019.  files updated: Files

5 years agoMerge branch 'housekeeping-to-merge-at-3.6.4-release' into NetHack-3.6
nhmall [Tue, 17 Dec 2019 19:19:20 +0000 (14:19 -0500)]
Merge branch 'housekeeping-to-merge-at-3.6.4-release' into NetHack-3.6

5 years agoMerge branch 'config-overflow-fix' of https://rodney.nethack.org:20040/git/NHsource...
nhmall [Tue, 17 Dec 2019 19:18:44 +0000 (14:18 -0500)]
Merge branch 'config-overflow-fix' of https://rodney.nethack.org:20040/git/NHsource into config-overflow-fix

5 years agofix potential buffer overflow loading config file
PatR [Fri, 13 Dec 2019 21:36:38 +0000 (13:36 -0800)]
fix potential buffer overflow loading config file

5 years agoMerge branch 'housekeeping-to-merge-at-3.6.4-release' of https://rodney.nethack.org...
nhmall [Tue, 17 Dec 2019 19:13:16 +0000 (14:13 -0500)]
Merge branch 'housekeeping-to-merge-at-3.6.4-release' of https://rodney.nethack.org:20040/git/NHsource into housekeeping-to-merge-at-3.6.4-release

5 years agohousekeeping updates for 3.6.4
nhmall [Fri, 13 Dec 2019 23:37:36 +0000 (18:37 -0500)]
housekeeping updates for 3.6.4

typos

README update

5 years agoREADME update
nhmall [Tue, 17 Dec 2019 19:00:28 +0000 (14:00 -0500)]
README update

5 years agoput original 3.7 fixes entry into 3.6 fixes file
nhmall [Tue, 17 Dec 2019 17:17:46 +0000 (12:17 -0500)]
put original 3.7 fixes entry into 3.6 fixes file

5 years agoclinger messaging
nhmall [Tue, 17 Dec 2019 16:47:25 +0000 (11:47 -0500)]
clinger messaging

5 years agoflying hero should be able to pass through a hole using '>'
nhmall [Mon, 16 Dec 2019 05:25:20 +0000 (00:25 -0500)]
flying hero should be able to pass through a hole using '>'

5 years agobuffer bit
nhmall [Tue, 17 Dec 2019 06:17:49 +0000 (01:17 -0500)]
buffer bit

5 years agocorrect revision of one file on the commit
nhmall [Tue, 17 Dec 2019 06:07:53 +0000 (01:07 -0500)]
correct revision of one file on the commit

5 years agoallow run-from-removable-device configuration on Windows
nhmall [Tue, 17 Dec 2019 05:41:55 +0000 (00:41 -0500)]
allow run-from-removable-device configuration on Windows

Allow a way to configure NetHack to run entirely from a USB stick
or other removable device in a way that allows everything to
reside entirely on the USB stick, and nothing on the computer's
hard drive. That could be done in versions prior to 3.6.3.

Sample:

i: is a USB stick

i:\nhdist contains the NetHack Windows distribution and a sysconf
file dropped into that distribution with the following entry in it:
portable_device_top = nethack

No device is included in the portable_device_top entry, the device
is always the device that the nethack exe resides on. If you try
to specify a device in the portable_device_top path, the device
portion will be ignored.

portable_device_top specifies the folder on the device that is writable
by NetHack and as such it cannot be the same folder that the executable
resides in.

i:\nhdist\nethack --showpaths
Variable playground locations:
    [hackdir   ]="i:\nethack\"
    [leveldir  ]="i:\nethack\"
    [savedir   ]="i:\nethack\"
    [bonesdir  ]="i:\nethack\"
    [datadir   ]="i:\nhdist\"
    [scoredir  ]="i:\nethack\"
    [lockdir   ]="i:\nethack\"
    [sysconfdir]="i:\nhdist\"
    [configdir ]="i:\nethack\"
    [troubledir]="i:\nethack\"
NetHack's system configuration file (in sysconfdir):
    "i:\nhdist\sysconf"
The loadable symbols file (in sysconfdir):
    "i:\nhdist\symbols"
Basic data files (in datadir) are collected inside:
    "i:\nhdist\nhdat363"
No end-of-game disclosure file (disabled).
Writable folder for portable device config (sysconf portable_device_top):
    "i:\nethack\"
Your personal configuration file (in configdir):
    "i:\nethack\.nethackrc"

Without that sysconf file in the NetHack distribution folder on the
USB stick with the 'portable_device_top = '  entry, the paths
return to the default locations for 3.6.3 on Windows:

i:\nhdist\nethack --showpaths
Variable playground locations:
    [hackdir   ]="C:\Users\JaneDoe\NetHack\3.6\"
    [leveldir  ]="C:\Users\JaneDoe\AppData\Local\NetHack\3.6\"
    [savedir   ]="C:\Users\JaneDoe\AppData\Local\NetHack\3.6\"
    [bonesdir  ]="C:\ProgramData\NetHack\3.6\"
    [datadir   ]="i:\nhdist\"
    [scoredir  ]="C:\ProgramData\NetHack\3.6\"
    [lockdir   ]="C:\ProgramData\NetHack\3.6\"
    [sysconfdir]="C:\ProgramData\NetHack\3.6\"
    [configdir ]="C:\Users\JaneDoe\NetHack\"
    [troubledir]="C:\Users\JaneDoe\NetHack\3.6\"
NetHack's system configuration file (in sysconfdir):
    "C:\ProgramData\NetHack\3.6\sysconf"
The loadable symbols file (in sysconfdir):
    "C:\ProgramData\NetHack\3.6\symbols"
Basic data files (in datadir) are collected inside:
    "i:\nhdist\nhdat363"
No end-of-game disclosure file (disabled).
Your personal configuration file (in configdir):
    "C:\Users\JaneDoe\NetHack\.nethackrc"

5 years agomistake file
nhmall [Sun, 15 Dec 2019 22:59:48 +0000 (17:59 -0500)]
mistake file

5 years agomore makedefs
nhmall [Sun, 15 Dec 2019 22:41:27 +0000 (17:41 -0500)]
more makedefs

5 years agoreport post-release in makedefs if someone happens to build post-release code
nhmall [Sun, 15 Dec 2019 22:22:11 +0000 (17:22 -0500)]
report post-release in makedefs if someone happens to build post-release code

5 years agoFix compilation on platforms that split the ncurses and tinfo libraries
Patric Mueller [Sun, 15 Dec 2019 19:38:44 +0000 (20:38 +0100)]
Fix compilation on platforms that split the ncurses and tinfo libraries

Some platforms compile ncurses in such a way that the tinfo library needs to
be separately linked in (e.g. Gentoo).

The tinfo library is a low-level library being used by and bundled with
ncurses.

Adding '-ltinfo' to WINTTYLIB in the hint files was considered the most robust
solution to this problem.  This still works on systems with ncurses 5.9.
Using pkg-config was ruled out as the default build of ncurses doesn't install
the necessary files.

5 years agoThis is cron-daily v1-Dec-12-2019. guidebook updated: doc/Guidebook.txt
nhw_cron [Sun, 15 Dec 2019 18:16:00 +0000 (13:16 -0500)]
This is cron-daily v1-Dec-12-2019.  guidebook updated: doc/Guidebook.txt

5 years agoMerge branch 'NetHack-3.6' into housekeeping-to-merge-at-3.6.4-release
nhmall [Sun, 15 Dec 2019 17:44:53 +0000 (12:44 -0500)]
Merge branch 'NetHack-3.6' into housekeeping-to-merge-at-3.6.4-release

5 years agoadd date to Guidebook.mn title page
keni [Sun, 15 Dec 2019 17:38:42 +0000 (12:38 -0500)]
add date to Guidebook.mn title page

5 years agofinalize fixes36.4
PatR [Sun, 15 Dec 2019 00:06:07 +0000 (16:06 -0800)]
finalize fixes36.4

5 years agoupdate config-overflow-fix with recent 3.6 changes
PatR [Sun, 15 Dec 2019 00:03:10 +0000 (16:03 -0800)]
update config-overflow-fix with recent 3.6 changes

5 years agofixes typo
PatR [Sat, 14 Dec 2019 01:39:39 +0000 (17:39 -0800)]
fixes typo

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 agotypos
nhmall [Fri, 13 Dec 2019 23:39:31 +0000 (18:39 -0500)]
typos

5 years agohousekeeping updates for 3.6.4
nhmall [Fri, 13 Dec 2019 23:37:36 +0000 (18:37 -0500)]
housekeeping updates for 3.6.4

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 agofix potential buffer overflow loading config file
PatR [Fri, 13 Dec 2019 21:36:38 +0000 (13:36 -0800)]
fix potential buffer overflow loading config file

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