Commit Graph
100 Commits
Author SHA1 Message Date
nhmall 4228cf534e follow-up bits 2018-11-20 19:09:05 -05:00
nhmall 1980acb757 Merge branch 'win-curses' into macosx-curses-fall2018 2018-11-20 18:12:41 -05:00
nhmall becfe90bfc more .gitignore updates for XCode 2018-11-19 16:27:57 -05:00
nhmall 7ee4fa3c3f some curses window-port doc bits 2018-11-19 10:40:51 -05:00
nhmall a4eb3df5f0 Merge branch 'NetHack-3.6.2-beta01' into macosx-curses-fall2018 2018-11-19 09:58:40 -05:00
nhmall 923e1c5854 Merge branch 'NetHack-3.6.2-beta01' into win-curses 2018-11-19 09:57:58 -05:00
nhmall a58571a475 .gitignore update 2018-11-18 23:53:49 -05:00
nhmall 9958fda6b5 Merge branch 'NetHack-3.6.2-beta01' into win-curses 2018-11-18 14:58:31 -05:00
nhmall 15da3e4d53 Merge branch 'win-curses' into macosx-curses-fall2018 2018-11-18 09:10:26 -05:00
nhmall bc8be48a92 quiet some mismatched prototype warnings with visual studio compiler
pager.c
.\pager.c(1886): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1887): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1888): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1889): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1890): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1891): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1893): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1895): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1896): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1897): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1898): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1902): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1921): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
2018-11-18 08:45:32 -05:00
nhmall 60c3c2f113 fix a build error when curses is NOT enabled
Fix an error when curses build macros are not defined
makefile(1262) : fatal error U1083: target macro '$(PDCLIB)' expands to nothing
2018-11-18 08:34:24 -05:00
nhmall 1b36af5d8a update Install.nt 2018-11-18 07:59:59 -05:00
nhmall bf0e0b9f12 Makefile cut-and-paste error 2018-11-18 07:10:58 -05:00
nhmall 935fe5bca8 Makefile macro correction 2018-11-18 06:57:17 -05:00
nhmall bbe7029e77 more curses Makfile mods 2018-11-18 06:48:47 -05:00
nhmall 9c4de50c9a windows VS Makefile with curses and PDCurses 2018-11-18 06:24:32 -05:00
nhmall 312f492149 Merge branch 'win-minor' into win-curses 2018-11-18 04:32:28 -05:00
nhmall 816a7dd871 Revert "curses port: accept return on Windows platform"
This reverts commit ac367ef4cc.
2018-11-17 21:30:01 -05:00
nhmall 2829e3f780 Revert "more CR on windows"
This reverts commit 83fb79b775.
2018-11-17 21:29:41 -05:00
nhmall 83fb79b775 more CR on windows 2018-11-17 21:17:43 -05:00
nhmall ac367ef4cc curses port: accept return on Windows platform 2018-11-17 20:27:21 -05:00
nhmall fecef470e0 Merge branch 'NetHack-3.6.2-beta01' into win-minor 2018-11-17 06:22:56 -05:00
nhmall 39c8f4347a Merge branch 'win-minor' into NetHack-3.6.2-beta01 2018-11-16 23:55:02 -05:00
nhmall 113d5cdb26 missed include/wincurs.h 2018-11-16 21:00:11 -05:00
nhmall 748280d5dc curses new file additions 2018-11-16 20:53:38 -05:00
nhmall cb43061076 curses changes to existing files 2018-11-16 20:51:22 -05:00
nhmall 20018c2719 Merge branch 'NetHack-3.6.2-beta01' into win-minor 2018-11-16 20:28:54 -05:00
nhmall 96ec49213f Add some windows command line option hooks 2018-11-16 19:32:00 -05:00
nhmall a9dcb37ca7 augment codepage850-to-Unicode mappings in nttty 2018-11-16 08:09:18 -05:00
nhmall 731e10f058 follow-up bit for stale gold sym 2018-11-15 02:51:27 -05:00
nhmall f000bfa76a Merge branch 'win-minor' into NetHack-3.6.2-beta01 2018-11-15 02:37:04 -05:00
nhmall 5d53514a56 Merge branch 'win-minor' of https://rodney.nethack.org:20040/git/NHsource into win-minor 2018-11-15 02:36:07 -05:00
nhmall acdc62a861 stale gold symbol displayed after symset change
a stale gold symbol could be displayed on the status line following a switch
to a new symset, as observed and reported for Windows RogueEpyx symset.

An update is required for gold in the status line for a change to
any of the following:
    context.rndencode value
    the encoded glyph value for COIN_CLASS
    the gold amount
2018-11-15 02:34:45 -05:00
nhmall 9130216545 Merge branch 'win-minor' into NetHack-3.6.2-beta01 2018-11-14 08:04:40 -05:00
nhmall 6764933413 newline at end of file 2018-11-14 07:51:25 -05:00
nhmall 8e907a0b0f Merge branch 'NetHack-3.6.2-beta01' into win-minor 2018-11-13 13:32:01 -05:00
nhmall 16e014b39f Merge branch 'win-minor' into NetHack-3.6.2-beta01 2018-11-12 23:15:13 -05:00
nhmall d89deb5bf7 Makefile update to reference recently added file 2018-11-12 23:10:42 -05:00
nhmall ed70005c9b Makefile build updates 2018-11-11 15:39:13 -05:00
nhmall e87496b897 merge fluff 2018-11-11 10:48:08 -05:00
nhmall a0b53ee391 merge 2018-11-11 10:29:52 -05:00
nhmall 359b59753f fixes update for odd wording 2018-11-07 17:08:41 -05:00
nhmall 6fb2000feb fix odd wording "The boulder triggers and fills a pit" 2018-11-07 17:06:45 -05:00
nhmall 0fb263ea88 fix broken build cause by missing semicolon 2018-11-05 15:33:02 -05:00
nhmall 4e98337abc grammar 2018-11-01 21:04:23 -04:00
nhmall 0ea7fbad7a single fixes36.2 entry for special case wish/genocide since release 2018-10-31 09:11:57 -04:00
nhmall 22b5abe4f4 watchmen at genocide prompt
Report stated:
	type "watchmen" into a genocide prompt, it says no such creatures exist in the world
	type "watchman" and it says "wiped out all watchmen"

fixes #151
2018-10-31 08:49:18 -04:00
nhmall 77c9930662 typo fix 2018-10-29 07:28:35 -04:00
nhmall aa0b973001 fix Guidebook.tex processing due to wrong brace used
[36] [37] [38] [39] [40] [41] [42] [43]
! Extra }, or forgotten \endgroup.
l.4602 ``{\tt up}'' and ``(\tt down}
                                    '' set the field attributes for when the...
2018-10-27 19:18:27 -04:00
nhmall 77376fc979 two more windows supporting bits 2018-10-20 23:14:34 -04:00
nhmall 270c228b60 windows build mods to support branch change
Changes to be committed:
	modified:   sys/winnt/Makefile.gcc
	modified:   sys/winnt/Makefile.msc
	modified:   win/win32/vs2015/NetHack.vcxproj
	modified:   win/win32/vs2015/NetHackW.vcxproj
	modified:   win/win32/vs2015/files.props
	modified:   win/win32/vs2017/NetHack.vcxproj
	modified:   win/win32/vs2017/NetHackW.vcxproj
	modified:   win/win32/vs2017/files.props
2018-10-20 23:14:33 -04:00
nhmall 530b2f06f1 Files merge cleanup 2018-10-19 18:13:26 -04:00
nhmall c8b73b08cd Revert "fix github issue #94 - files missing from Files"
This reverts commit ec19b52d8d.
2018-10-18 21:43:36 -04:00
nhmall e25c7be719 keyhelp missed during Windows build steps
BUG REPORT:

    comments:
    1. I start a new character.
    2. The first command I type is '&'
    3. I type "?" and "<enter key>" at the prompt.
    4. Cannot open "keyhelp" data file!--More--
       ?    give a help message.

1559
2018-10-12 20:57:26 -04:00
nhmall c6a5ec1ab6 ensure tmp_at() structures are initialized for all code paths when swallowed 2018-10-04 22:02:28 -04:00
nhmall 8ce1f88f53 Revert "ensure tmp_at() structures are initialized for all code paths when swallowed"
This reverts commit 39074d29fc.

Bad commit of do_throw
2018-10-04 22:00:51 -04:00
nhmall 67c80b2e4b Revert "fix up a bad commit"
This reverts commit 2eb8436db2.
2018-10-04 22:00:08 -04:00
nhmall 2eb8436db2 fix up a bad commit 2018-10-04 21:55:01 -04:00
nhmall 39074d29fc ensure tmp_at() structures are initialized for all code paths when swallowed 2018-10-04 21:49:16 -04:00
nhmall d9ecc42566 a couple of steed Flying messages 2018-09-30 10:01:43 -04:00
nhmall 85aef136d5 comment typo in music.c 2018-09-30 08:45:49 -04:00
nhmall 00dfed5b3a move assignment outside inner loop 2018-09-29 23:38:20 -04:00
nhmall ef199f3763 one more update for the right of the status line
This tracks the last character written on each row and clears
the previous content from the end independently of which field
is actually involved.
2018-09-29 23:21:11 -04:00
nhmall d1c5649890 revisit display artifact appearing to the right of status line
The prior fix for this was a bit flawed. It was only considering
the length of the last field, but what it really needed to do was
consider the placement of the last character of the last field
on the row relative to the placement of the last character of
the last field on the row previously.

If the new placement of that last character of the last field
is left of the previous placement, some clearing must be done.
2018-09-29 22:28:10 -04:00
nhmall 394c72d366 display cleanup only targets the right-most field where it's needed 2018-09-28 12:55:30 -04:00
nhmall bdc9a6b98e follow-up bit 2018-09-28 02:28:54 -04:00
nhmall b14d495ce4 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2018-09-28 02:09:30 -04:00
nhmall 5639539568 tty: fix leftover display artifact when last field on the row got smaller 2018-09-28 02:09:07 -04:00
nhmall c5d0f6dd9d fix out of bounds error in tty_status_update() for BL_HUNGER case
The pointer could go out of bounds when decremented if it was pointing
at the start of the status_vals[BL_HUNGER] (empty string).

Also, guard tty_status_update() from an out of range index being
passed to it (botl shouldn't do that, but...).

The legal 1st parameter values for tty_status_update() in 3.6.2 are

	BL_RESET     (-2)
	BL_FLUSH     (-1)
	BL_TITLE     ( 0)
	...though to...
	BL_CONDITION (22)

  count MAXBLSTATS = (BL_CONDITION + 1)

There's a BL_CHARACTERISTIC (-3) defined in the botl.h header file,
but it is not used in wintty.c and is now screened out along with
everything lower and everything MAXBLSTATS and above.

closes #142
fixes #141
2018-09-26 17:18:09 -04:00
nhmall 74b7829957 engr follow-up bit 2018-09-26 01:35:48 -04:00
nhmall 0fecf19789 wand of polymorph engrave for blind writers
Don't provide any discerning feedback on the blind player's turn
but do allow the wand to exercise its magic in a manner reflective
of blind writers
2018-09-26 01:10:27 -04:00
nhmall 2a92111223 fix missing space in "would flyif you weren't levitating"
Fixes #140
2018-09-25 23:28:20 -04:00
nhmall eb63d6a023 Merge branch 'copperwater-flyif_fix' into NetHack-3.6.2-beta01 2018-09-25 23:24:44 -04:00
nhmall cd0a29eae8 Merge branch 'flyif_fix' of https://github.com/copperwater/NetHack into copperwater-flyif_fix 2018-09-25 23:22:11 -04:00
nhmall 039ad51660 don't impact player stats with wizard mode ^T 2018-09-25 23:08:09 -04:00
nhmall 3f5ef9bdf3 make long extended commands list be more navigable 2018-09-24 16:45:38 -04:00
nhmall 22d69d2424 update tournament reference 2018-09-24 15:59:38 -04:00
nhmall 02b1ce2d9a no leash-related message is given when leashed pet yellow light explodes
mondead() -> m_detach() -> m_unleash() suppresses
the m_unleash() slack message, so deliver it in
the caller explmm() in those circumstances.

(The issue of whether it should be possible to leash light
is side-stepped.)

bug H7406, 1548
2018-09-23 14:06:18 -04:00
nhmall 2813e42b22 known bear trap forgotton by player polymorphed into a flyer
The original report stated:

     "I located a bear trap as a human and just ignored it
     for the time. I polymporphed into a Vampire Lord, then
     went to #untrap the bear trap.  On the first attempt,
     I stood beside the trap and attempted to #untrap.  I
     received the 'Whoops!' message and automatically moved
     onto the trap square as a result. The bear trap vanished!
     I obviously wasn't trapped since I'm polymorphed into a
     flying monster, but the trap glyph was no longer present.
     The glyph looked like regular floor - as if I had
     untrapped the bear trap and taken the trap with me."

The trap was actually still there but became hidden intentionally
for other valid scenarios, but was an unintended side-effect for
this scenario.

Fix it by failing the #untrap operation for a Flyer earlier on,
and in a more benign manner, since the Flyer ultimately doesn't
end up in the trap anyway.  You'll still get the "Whoops!",
followed by a message, but that's as far as the "failed" #untrap
attempt will go under the circumstances.
2018-09-23 11:16:09 -04:00
nhmall 76bffe5ba4 drum of earthquake causing deafness inappropriately
Address a drum of earthquake inconsistency reported 2017-03-23:
"Drum of earthquake does not make you deaf.  Leather drum or depleted
drum of earthquake does."

bug 1099
2018-09-23 10:11:02 -04:00
nhmall 84c17d2e21 two typo/follow-up bits 2018-09-22 23:01:39 -04:00
nhmall 21a81d0294 BL_RESET usage for window port status line updating
Like BL_FLUSH, only send BL_RESET if the window port has
indicated it wants them via setting the appropriate WC2
bits in its window_procs structure. Update documentation.
2018-09-22 22:41:02 -04:00
nhmall bbb81700f5 sunsword vs gremlin
The original report complained that gremlins seemed impervious to
Sunsword's light yet a flash from a camera caused them to cry out in pain
despite "The long sword named Sunsword begins to shine brilliantly!"

This commit does two things:
1. A dmg bonus is applied against gremlins using a lit Sunsword.
2. Gremlins will generally avoid the light emitted by Sunsword.
There's a few minor flavor bits thrown in also.

It is understood that this effectively makes Sunsword provide
"gremlin-proofing", but the gremlin myth and Sunsword's characteristic
feature pretty much demand it.

bug 42
2018-09-22 14:08:28 -04:00
nhmall 6a86cafa90 X11 exposed a genl_status_update negative index issue 2018-09-22 10:20:08 -04:00
nhmall faf1a83fd0 follow-up bit 2018-09-22 09:24:20 -04:00
nhmall fe68925100 another BL_CHARACTERISTICS fix
With the code as it stood, receipt of BL_CHARACTERISTICS would
trigger a flush of output which may not have been the
intention.

Ensure the flush code is only on BL_FLUSH (or BL_RESET).
2018-09-22 09:11:51 -04:00
nhmall 0aa9e00099 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2018-09-22 09:01:37 -04:00
nhmall 0a52543076 avoid illegal array indexes now that the enum treads beyond BL_FLUSH 2018-09-22 08:58:38 -04:00
nhmall 8e4ce066c9 fix C343-331 mirrors & sleeping mon
This outstanding bug was complicated slightly because the same
code was used for a sleeping mon as for a paralyzed mon so
message phrasing was called into question.

Just flip the phrasing to be about what you are able to discern
under those circumstances, which is very little, and don't have
the sleeping or paralyzed monster react to the mirror.
2018-09-21 23:34:00 -04:00
nhmall b5f9a8c722 transcription bit 2018-09-21 16:36:38 -04:00
nhmall 825a9498b4 more historical fixes info 2018-09-21 16:33:48 -04:00
nhmall 94e630e2e7 include some fixes files from older versions in the distribution
new file:   doc/fixes23.e
	new file:   doc/fixes30.pl01
	new file:   doc/fixes30.pl02
	new file:   doc/fixes30.pl03
	new file:   doc/fixes30.pl04
	new file:   doc/fixes30.pl05
	new file:   doc/fixes30.pl06
	new file:   doc/fixes30.pl07
	new file:   doc/fixes30.pl08
	new file:   doc/fixes30.pl09
	new file:   doc/fixes30.pl10
2018-09-21 14:57:12 -04:00
nhmall 25fcaa614c another orctown follow-up tuning bit 2018-09-21 11:54:43 -04:00
nhmall 6c41eb3f91 fixes bit 2018-09-21 11:42:16 -04:00
nhmall a18ae517f8 some orctown follow-up bits, fix Bad fruit #0 and some minor tuning 2018-09-21 11:31:01 -04:00
nhmall 3edc6d3147 Merge branch 'mogigoma-fix-grammar-and-punctuation' into NetHack-3.6.2-beta01 2018-09-20 18:03:42 -04:00
nhmall de7121ea5d cannot alter doc/tmac.n 2018-09-20 18:02:48 -04:00
nhmall 672e28d294 Merge branch 'fix-grammar-and-punctuation' of https://github.com/mogigoma/NetHack into mogigoma-fix-grammar-and-punctuation 2018-09-20 18:01:32 -04:00
nhmall 9c6fe0b377 initialize a supplement buffer 2018-09-20 17:58:10 -04:00
nhmall bfc46cbcdb Merge branch 'winX-comment-typo' of https://github.com/nikolas/NetHack into nikolas 2018-09-19 23:40:31 -04:00