Commit Graph
91 Commits
Author SHA1 Message Date
nhmall 93e0cb5235 nethackw clear after getlin
Alex wrote: in nethackw, getlin clears message
window, so any unread messages are scrolled off the screen without
"--more--" prompt. If vary_msgcount is set to 1 and "potion shatters", it
is not easy to see the effect to name the potion correctly.
2018-04-24 08:15:36 -04:00
nhmall 44ac268590 Install.nt bit 2018-04-23 21:47:46 -04:00
nhmall 6623b5b007 Update Guidebook.txt 2018-04-23 21:38:36 -04:00
nhmall f6496a61f1 Apr23 Guidebook date bump 2018-04-23 21:31:28 -04:00
nhmall e236c23b35 windows record file diagnostic info 2018-04-22 12:15:30 -04:00
nhmall d420d8073d update some old version references 2018-04-21 18:05:46 -04:00
nhmall 21d1e68951 Guidebook.txt update 2018-04-21 17:27:36 -04:00
nhmall 6a7f05cec0 fix --version:paste for NetHackW
Adjust port_insert_pastebuf() for Windows so that it
works on the console and GUI variations.
2018-04-21 10:37:10 -04:00
nhmall a7df684d25 Windows instructions update 2018-04-21 09:33:47 -04:00
nhmall 56ceea5a41 more adjacent pit 2018-04-21 08:00:57 -04:00
nhmall 2ce0fbd571 Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0 2018-04-21 07:01:27 -04:00
nhmall b938808ff0 clean up some code pasted from other function 2018-04-21 06:57:52 -04:00
nhmall 13fc83a6a2 VS debugger couldn't handle a naming collision appropriately 2018-04-21 01:07:20 -04:00
nhmall e48600ec87 adjacent pit movement isn't a fall
H7074 1311

> When moving from a pit into an adjacent pit, you "fall into" the pit and take
> damage. This happens even when you are walking back and forth between two pits,
> repeatedly, where you should have no way to fall.
>
> The intent seems to be that you can move into the adjacent pit without having
> to climb out of the first one, and this works properly - the only problem is
> that the pit gets triggered when you ought to have no distance to fall.

This is really just stumbling over uncleared clutter, not a pit fall.
There was already a way to clear the clutter between adjacent pits.
2018-04-21 00:47:59 -04:00
nhmall 58eb1430b1 Guidebook.tex bit
also date bump
2018-04-20 19:00:35 -04:00
nhmall 12e65cde47 history paragraph sync with Guidebook 2018-04-19 22:43:21 -04:00
nhmall 5895c18ab5 sync TeX Guidebook content bit with nroff Guidebook content 2018-04-19 22:27:26 -04:00
nhmall 9539dc40ce more Guidebook
Remove 3.6.0-specific preface.
Bump the date.
2018-04-19 22:10:46 -04:00
nhmall 3b86b29ce8 extraneous braces 2018-04-16 20:44:45 -04:00
nhmall b5a623a6d7 fix Guidebook.tex creation
The Guidebook.tex band in it breaks the creation of Guidebook.tex.

    ! Not a letter.
    l.2701 \hyphenation{.
                     nethackrc}
    ?

For these simple one-time situations, just use \mbox{} to prevent
them from hyphenation instead.
2018-04-16 20:35:53 -04:00
nhmall 123dddebb6 Guidebook date bump 2018-04-16 19:55:04 -04:00
nhmall 68b1d0c7ba doc update 2018-04-14 19:01:15 -04:00
nhmall a972554d7e more Guidebook symbols 2018-04-14 18:46:14 -04:00
nhmall 97a2995c28 spotted a typo in Guidebook.tex 2018-04-14 17:53:37 -04:00
nhmall 7945d517f4 more Guidebook 2018-04-14 17:34:05 -04:00
nhmall fbb7aaaa63 bump the Guidebook date 2018-04-14 17:30:45 -04:00
nhmall 8acfd6dbef Three apparently didn't require it
Even though they appeared in a document as being "special"
food, fountain, and lava symbol didn't require the quote sequence
2018-04-14 17:08:51 -04:00
nhmall 1c180fd09c TeX characters with special meaning 2018-04-14 17:06:16 -04:00
nhmall b8ea930e46 fix a heading and table column misalignment in doc/Guidebook.tex 2018-04-14 16:57:48 -04:00
nhmall 297fb5522e updated 2018-04-07 08:58:35 -04:00
nhmall c24d13f391 another guidebook typo 2018-04-07 08:38:17 -04:00
nhmall e820f3561d cleanup 2018-04-05 21:10:28 -04:00
nhmall b0817ee88a gb typo fix 2018-04-05 20:49:12 -04:00
nhmall 00fbff1f2c Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0 2018-04-05 18:53:08 -04:00
nhmall 4357f644b0 gb sync 2018-04-05 18:51:50 -04:00
nhmall c9acbf8d14 more Guidebook updates 2018-04-05 17:59:52 -04:00
nhmall b7d07e0d91 guidebook updates today's date and dungeoneers columns 2018-04-05 07:50:49 -04:00
nhmall 7238803b25 revert box naming 2018-03-19 07:13:07 -04:00
nhmall 5b03dccb19 missed one, transcription error 2018-03-18 10:29:45 -04:00
nhmall 1d5f67c9ed misplacement 2018-03-18 10:11:51 -04:00
nhmall ff67fac614 remove a couple where normal man->men rules should apply 2018-03-18 10:09:45 -04:00
nhmall 1ab2c25c9a another dictionary consulted, another couple of prefixes 2018-03-18 09:54:18 -04:00
nhmall d8b12eefe7 just a couple of additional pluralization bits 2018-03-18 09:24:38 -04:00
nhmall 8ce08d3cf9 3rd time fixes36.1 2018-03-18 09:09:08 -04:00
nhmall 168d5171b7 typo in fixes36.1
locks -> lock
2018-03-18 08:52:34 -04:00
nhmall e7ed6508cd more message adjustments to chests with broken locks 2018-03-18 08:49:25 -04:00
nhmall e07c6b5b77 broken large box wording change
> When you try to #force a large box or chest whose lock is already broken from a
> previous #force, the game tells you "There is a broken large box here, but its
> lock is already broken." It's minor, but this implies that the box being broken
> is separate from the lock being broken (as well as that the box itself *can* be
> broken).

change the wording to "lock-damaged box" and suppress
", but its lock is aleady broken" when "lock-damaged box" has
already been displayed.

(Nobody particularly likes the wording "lock-damaged box" either, but at least
it seems less misleading)
2018-03-17 23:05:52 -04:00
nhmall f2d92426cc more plural refinement 2018-03-16 22:34:13 -04:00
nhmall c42dc27330 ox tweak 2018-03-15 22:19:28 -04:00
nhmall 467e3bfdab more pluralization bits
Handle more *man and *men cases.

Some plural usage of completely made up fruit names that should
be entered in singular form but have what appears to be a
valid plural name it will end up singularized. Not much
we can do about that for ficticious words.

For instance, if you try to name your fruit bigmen or snakemen
and you intended that to be the singular name, NetHack will likely
singularize it to bigman or snakeman.

Many real dictionary words that end in "men", however, should
be handled a wee bit better now. A real word such as stamen,
for example.
2018-03-15 22:02:41 -04:00
nhmall 0b6e26d9e0 windows spotless bit 2018-03-12 08:47:37 -04:00
nhmall ae6a391997 fix an out of range issue on WIN32 tty 2018-03-11 23:38:00 -04:00
nhmall 4e086caceb ensure tty_curs() behaves the same whether DEBUG defined or not
ensure tty_curs() behaves the same whether DEBUG defined or not
when it comes to positioning the cursor.

The return statement, in the debug case only, was preventing
the cursor from being moved following a range check, so the
next output was written whereever the cursor happened to be
previously.

The messaging that detects the failed range check will get
written in the DEBUG defined case hopefully allowing resolution
to the range check failure, but now the cmov will still
be attempted just as it is in the case where DEBUG is not
defined.
2018-03-11 23:29:06 -04:00
nhmall 6fc324798e H5239 not hypocrisy to speed up your own pet
H5239 1100
2018-03-10 13:17:21 -05:00
nhmall 6586e9204b pluralization special case tweak
mongoose -> mongooses, not mongeese
2018-03-10 11:28:01 -05:00
nhmall 5fece7b175 pluralization bits 2018-03-10 10:43:34 -05:00
nhmall 2317288150 more nmake spotless 2018-03-04 10:37:43 -05:00
nhmall a120d99005 msc makefiles update timestamp on copied files 2018-03-04 10:30:17 -05:00
nhmall dee2fea82d msc Makefile 2018-03-04 10:25:11 -05:00
nhmall 12562694a9 update nmake spotless for windows 2018-03-04 10:09:35 -05:00
nhmall 939bd356a4 more msc makefile tweaks 2018-03-04 09:54:29 -05:00
nhmall 777317224b windows cmdline dependency bit 2018-03-04 09:11:01 -05:00
nhmall eddfcc4422 windows cmdline Makefile 2018-03-04 09:07:16 -05:00
nhmall 27a7538e38 enable USE_WIN_IOCTL code unless explicitly avoided
Changes to be committed:
	modified:   doc/fixes36.1
	modified:   include/unixconf.h
	modified:   sys/share/ioctl.c

github pull request #19 made reference to resulting code behaviour
being better when windows were resized when USE_WIN_IOCTL was defined.

The logic for including the necessary enabling code in the build in
sys/share/ioctl.c was an explicit "opt-in" strategy, so anything not
deliberately and explicitly listed was not able to take advantae
of the potentially useful code. The need to add #defines to that
list would have been perpetual as new platforms came online, and
unnecessarily restrictive for everything else.

This switches the logic to include the code by default now,
and thus
unless there is an explicit "opt-out" by uncommenting
AVOID_WIN_IOCTL in include/unixconf.h

Some platforms, and we have no way of knowing which ones, may have
to ensure that AVOID_WIN_IOCTL is #define'd.
2018-03-03 12:58:53 -05:00
nhmall 9ee13bdd22 typo missing word 2018-03-03 10:24:26 -05:00
nhmall 4029e2580a interim dungeoneer, README update 2018-03-03 10:19:47 -05:00
nhmall d4ea0f6ce6 date bit 2018-03-02 15:35:07 -05:00
nhmall 4126b1e57a final msdos bit un-revert a reversion 2018-02-25 18:15:28 -05:00
nhmall 8db8a14429 fixes36.1 catch-up bit for deaf whistling 2018-02-25 17:52:33 -05:00
nhmall c475a5f0c6 Bug 734 - #H4611: Whistling while deaf
fixed
2018-02-25 17:42:31 -05:00
nhmall 424ce85e79 msdos Makefile update for posix regex 2018-02-25 16:28:46 -05:00
nhmall 418b5e9034 update msdos header 2018-02-25 15:15:10 -05:00
nhmall 176b85fbb7 update msdos Makefile so at least possible to build 2018-02-25 15:09:56 -05:00
nhmall 5370c0d337 resolve part of H4422 related to .exe versions
I also saw
 that looking at the details of both windows .exes that they indicate file
 version 3.5.0.0. Shouldn't it be 3.6.0.0 for the NH version 3.6.0
2018-02-25 12:20:50 -05:00
nhmall 269363467c another msdos bit 2018-02-24 23:32:54 -05:00
nhmall 9773742e82 fix some msdos build errors 2018-02-24 23:26:25 -05:00
nhmall c8196b6451 a documentation bit 2018-02-23 19:50:28 -05:00
nhmall 65655d2cee Incorporate some git information into NetHack
Incorporate some git information into NetHack so that it
is potentially visible to a player. That's useful when
collecting details about the version that they are
running and, if the gitinfo is present, it can tie the
code to a specific git commit in the repository.

This modifies 'makedefs -v' to check for the presence of a data file
called dat/gitinfo.txt and if it is there, parse out its
contents, then write additional lines to include/date.h beyond
what 'makedefs -v' was previously putting in there, similar to
this sample:

      #define NETHACK_GIT_SHA "0c84e564c78e2024e562d39539376ce2e21eec8e"
      #define NETHACK_GIT_BRANCH "NetHack-3.6.0"

The contents of an appropriate dat/gitinfo.txt are as follows,
and trailing/leading whitespace is not significant:

      githash = 0c84e564c78e2024e562d39539376ce2e21eec8e
      gitbranch = NetHack-3.6.0

It also adjusts the contents of the 'v' version information to
include the additional git info when available.

Also adds some hooks DEVEL/hooksdir and a perl file to DEVEL
for simplifying and automating the deposit of dat/gitinfo.txt
so that it generally reflects the most current git commit.

DEVEL/gitinfo.pl can be used to build dat/gitinfo.txt at any
time without doing a commit, merge, or checkout.
    	perl DEVEL/gitinfo.pl

command line --version and -version support

To complement the extra information being provided in the
version by the 'v' command, this also adds support for the
following new command line arguments:
    --version
     -version            Output the NetHack version string then exit.

    --version:paste      Output the NetHack version string and also copy it to
     -version:paste      the platform's paste buffer for insertion somewhere,
                         then exit.

If the paste variation of -version is requested on a platform that
hasn't incorporated any support for the capability, it will deliver
the version info then an error message, prior to exiting.

To support the extended -version:paste variation, a port needs to:
    - provide a port-specific routine to perform
      the paste buffer copy in a port code file.
    - #define RUNTIME_PASTEBUF_SUPPORT in the include/portconf.h header file.

    --skeleton--
    void port_insert_pastebuf(buf)
    char *buf;
    {
    	/* insert code to copy the version info from buf into
    	   platform's paste buffer in a supported way */
    }

macosx and Windows have both added support for RUNTIME_PASTEBUF_SUPPORT
2018-02-23 19:34:44 -05:00
nhmall 25d17eb62c fix some typos mentioned downstream 2018-02-19 21:32:54 -05:00
nhmall f72f72f863 update fixes36.1 with the docall() prompt string overrun 2018-02-19 15:42:18 -05:00
nhmall 7a0ad0ff21 sync README and DEVEL/Developer re: repositories 2018-02-19 11:18:57 -05:00
nhmall 0301420fcb fix reported stack corruption bug during Call
Fix an issue reported as github #74.
Some guard code was required to prevent writing past end of qbuf
via a sprintf.
2018-02-19 10:19:44 -05:00
nhmall 1eb5919a85 I noticed makedefs was segfaulting when argc == 1 2018-02-16 14:52:02 -05:00
nhmall e181f1acf9 command line Makefile update for vs compiler 2018-02-09 18:57:43 -05:00
nhmall d2245aab29 version output appearance bits 2018-01-26 17:25:21 -05:00
nhmall 9728616a21 fix branch placement of change 2018-01-26 08:06:23 -05:00
nhmall fec245dba2 Only update dat/gitinfo.txt if the hash is new 2018-01-26 08:01:03 -05:00
nhmall 0ffde7e45f copyright notice to 2018 2018-01-25 23:23:16 -05:00
nhmall 7eb05aef65 git on windows was misbehaving on doc/window.doc
Changes to be committed:
	modified:   .gitattributes
2017-12-09 10:51:41 -05:00
nhmall fdf07f932b Update the Files file that tracks what's in the source tree 2017-12-03 09:40:48 -05:00
nhmall 2cfbd682a1 VS community editions are freely downloadable. Maintain only 2 most recent.
Changes to be committed:
	modified:   sys/winnt/Install.nt
	modified:   sys/winnt/Makefile.msc
	modified:   sys/winnt/nhsetup.bat
	deleted:    win/win32/vs2010/NetHack.sln
	deleted:    win/win32/vs2010/NetHackW.vcxproj
	deleted:    win/win32/vs2010/dgncomp.vcxproj
	deleted:    win/win32/vs2010/dgnstuff.vcxproj
	deleted:    win/win32/vs2010/dlb_main.vcxproj
	deleted:    win/win32/vs2010/levcomp.vcxproj
	deleted:    win/win32/vs2010/levstuff.vcxproj
	deleted:    win/win32/vs2010/makedefs.vcxproj
	deleted:    win/win32/vs2010/recover.vcxproj
	deleted:    win/win32/vs2010/tile2bmp.vcxproj
	deleted:    win/win32/vs2010/tilemap.vcxproj
	deleted:    win/win32/vs2010/tiles.vcxproj
	deleted:    win/win32/vs2010/uudecode.vcxproj
	deleted:    win/win32/vs2013/NetHack.sln
	deleted:    win/win32/vs2013/NetHack.vcxproj
	deleted:    win/win32/vs2013/NetHackW.vcxproj
	deleted:    win/win32/vs2013/dgncomp.vcxproj
	deleted:    win/win32/vs2013/dgnstuff.vcxproj
	deleted:    win/win32/vs2013/dlb_main.vcxproj
	deleted:    win/win32/vs2013/levcomp.vcxproj
	deleted:    win/win32/vs2013/levstuff.vcxproj
	deleted:    win/win32/vs2013/makedefs.vcxproj
	deleted:    win/win32/vs2013/nhdefkey.vcxproj
	deleted:    win/win32/vs2013/recover.vcxproj
	deleted:    win/win32/vs2013/tile2bmp.vcxproj
	deleted:    win/win32/vs2013/tilemap.vcxproj
	deleted:    win/win32/vs2013/tiles.vcxproj
	deleted:    win/win32/vs2013/uudecode.vcxproj
2017-12-03 08:42:38 -05:00