nhmall [Thu, 17 May 2018 03:31:27 +0000 (23:31 -0400)]
another beta bit
nhmall [Thu, 17 May 2018 03:26:07 +0000 (23:26 -0400)]
sync date between two Guidebook files (.mn, .tex)
nhmall [Thu, 17 May 2018 03:23:08 +0000 (23:23 -0400)]
beta bit
Display the word beta in a better spot on the line
nhmall [Thu, 17 May 2018 03:08:37 +0000 (23:08 -0400)]
more bump of version ID
nhmall [Thu, 17 May 2018 03:06:44 +0000 (23:06 -0400)]
bump version ID values
PatR [Wed, 16 May 2018 00:09:47 +0000 (17:09 -0700)]
tty/wintty.c w/o TEXTCOLOR
With TEXTCOLOR disabled, compiler warnings about term_start_color()
and term_end_color() not being declared were followed by link failure
because they weren't available.
This tries to simplify color handling in the tty status code without
resorting to #if TEXTCOLOR (the proper fix, but somewhat intrusive).
For the usual case where TEXTCOLOR is defined, there were instances
of
if (color != NO_COLOR && color != CLR_MAX)
term_start_color();
...
if (color != NO_COLOR)
term_end_color();
and also of
if (color != NO_COLOR)
term_start_color();
...
if (color != NO_COLOR)
term_end_color();
I've changed both types to be
if (color != NO_COLOR && color != CLR_MAX)
term_start_color();
...
if (color != NO_COLOR && color != CLR_MAX)
term_end_color();
so that start/end pairing will always be consistent.
Also, ((color_and_attr & 0xFF00) >> 8) might not work as intended if
using 16-bit int and color_and_attr happened to have its sign bit set.
Change to ((color_and_attr >> 8) & 0x00FF) to ensure just the desired
bits.
Also also, a couple more formatting bits.
PatR [Wed, 16 May 2018 00:08:40 +0000 (17:08 -0700)]
X11/winX.c w/o TEXTCOLOR
Avoid warnings when TEXTCOLOR isn't enabled.
PatR [Wed, 16 May 2018 00:06:51 +0000 (17:06 -0700)]
mapglyph.c w/o TEXTCOLOR
Avoid warnings when TEXTCOLOR isn't enabled.
nhmall [Tue, 15 May 2018 23:41:12 +0000 (19:41 -0400)]
fixes36.2 catch-up for previous commit
nhmall [Tue, 15 May 2018 23:39:05 +0000 (19:39 -0400)]
fix access violation when --debug:xxxx has no other args after it
nhmall [Tue, 15 May 2018 23:35:36 +0000 (19:35 -0400)]
fix spaces in hilite_status option text field not working H7107 (GitHub #88)
Fixes #88
H7107: FWD: spaces in hilite_status option text field not working
keni [Tue, 15 May 2018 20:30:28 +0000 (16:30 -0400)]
fix H7138: sys/unix/setup.sh fails with no arguments
Sanity check was in the wrong place.
nhmall [Tue, 15 May 2018 13:03:35 +0000 (09:03 -0400)]
fix a couple of status items, gold highlighting and a boundary check
typo
gold highlighting
boundary check on tty_curs()
PatR [Tue, 15 May 2018 11:16:40 +0000 (04:16 -0700)]
tty status
Started by removing two or three unused variables, ended up cleaning
up a lot of formatting (tabs, trailing spaces, indentation, a few
wide lines, 'if (test) return' on same line). Marked some static
functions as static in their definitions instead of leaving it hidden
in their prototypes. Moved a pair of short-circuit checks to skip
several initializations.
PatR [Tue, 15 May 2018 11:15:41 +0000 (04:15 -0700)]
debug logging
Remove unused variables.
nhmall [Tue, 15 May 2018 10:41:06 +0000 (06:41 -0400)]
integrate aklys feature introduced in 3.6.1 into 3.6.x display
nhmall [Mon, 30 Apr 2018 02:50:07 +0000 (22:50 -0400)]
add prototype
(cherry picked from commit
438cfd3815420aab1b7a8bbaf06f3ba2c9b3fe59)
nhmall [Sun, 29 Apr 2018 14:40:11 +0000 (10:40 -0400)]
integrate aklys feature introduced in 3.6.1 into display
(cherry picked from commit
3fe8325f14481f450058c0b7b4abba0bbe25a6ef)
nhmall [Tue, 15 May 2018 05:30:31 +0000 (01:30 -0400)]
Merge branch 'win-minor' into NetHack-3.6.0
nhmall [Tue, 15 May 2018 05:29:36 +0000 (01:29 -0400)]
boundary bit
nhmall [Tue, 15 May 2018 05:10:32 +0000 (01:10 -0400)]
catch up on fixes36.2 updates
nhmall [Tue, 15 May 2018 04:27:11 +0000 (00:27 -0400)]
Merge branch 'win-minor' into NetHack-3.6.0
nhmall [Tue, 15 May 2018 04:26:26 +0000 (00:26 -0400)]
Merge branch 'win-tty-status' into win-minor
nhmall [Tue, 15 May 2018 02:25:25 +0000 (22:25 -0400)]
a few cut-and-paste errors
nhmall [Tue, 15 May 2018 01:13:37 +0000 (21:13 -0400)]
some tty per field rendering and optimization
nhmall [Tue, 15 May 2018 01:09:01 +0000 (21:09 -0400)]
put back the functionality of commandline --debug:immediateflips overwritten recently
Bart House [Mon, 14 May 2018 03:46:43 +0000 (20:46 -0700)]
Additional changes to xputc_core() and early_raw_print() to manage
the cursor position correctly. This is needed to handle raw printing
correctly. Added check for when we might be running off the bottom
of the screen when handling msmsg(). Added runtime checks to keep
cursor always within bounds.
Bart House [Mon, 14 May 2018 01:54:20 +0000 (18:54 -0700)]
Changes to xputc_core to handle cursor correctly.
nhmall [Mon, 14 May 2018 01:24:14 +0000 (21:24 -0400)]
testing build with STATUS_HILITES
nhmall [Sun, 13 May 2018 20:42:11 +0000 (16:42 -0400)]
missing stubs for NetHackW.exe
Bart House [Sun, 13 May 2018 20:29:13 +0000 (13:29 -0700)]
Removing temporary debugging code and fixing compiler warnings.
Bart House [Sun, 13 May 2018 19:49:52 +0000 (12:49 -0700)]
Fixing typo.
nhmall [Sun, 13 May 2018 19:21:46 +0000 (15:21 -0400)]
Merge branch 'tty-status' into win-tty-status
nhmall [Sun, 13 May 2018 19:19:39 +0000 (15:19 -0400)]
more status updates
- prevent an overflow
- add make_things_fit()
Bart House [Sun, 13 May 2018 02:45:16 +0000 (19:45 -0700)]
Fix memory leak. See bug 1169.
PatR [Sat, 12 May 2018 08:05:29 +0000 (01:05 -0700)]
fix #H7140 - list MSGTYPE values shows empty strings
The 'O' menu's 'list' for MSGTYPE settings showed truncated versions
of really long message strings but didn't show anything except the
hide/stop/norep setting for ordinary length ones. 3.6.0 showed the
latter correctly but suffered buffer overflow for the former; the
fix for that had a typo/thinko in it.
PatR [Sat, 12 May 2018 13:41:57 +0000 (06:41 -0700)]
fix "a Vlad the Impaler"
Killing Vlad while he was in bat/fog cloud/wolf form gave poorly
worded feedback when he reverted to vampire form.
Bart House [Sun, 13 May 2018 01:06:23 +0000 (18:06 -0700)]
Fix for bug 324 (aka H4216). We now will use nhraykey by default if the
players keyboard layout is non-english. nhraykey properly handles
non-english input. We also now support changing altkeyhandler in game.
Bart House [Sat, 12 May 2018 22:58:44 +0000 (15:58 -0700)]
Some nttty.c clean-up.
Bart House [Sat, 12 May 2018 20:59:06 +0000 (13:59 -0700)]
Added ntassert() mechanism for Windows based port use.
nhmall [Sat, 12 May 2018 18:44:12 +0000 (14:44 -0400)]
Merge branch 'tty-status' into win-tty-status
nhmall [Sat, 12 May 2018 18:42:19 +0000 (14:42 -0400)]
empty field suppression caught condition values unintentionally
nhmall [Sat, 12 May 2018 18:10:52 +0000 (14:10 -0400)]
more status handling updates
Suppress unneeded spaces from a couple of fields
BL_LEVELDESC - trailing spaces.
BL_CAP - it only contains a space
nhmall [Sat, 12 May 2018 10:57:34 +0000 (06:57 -0400)]
some build fixes for compile issues reported
nhmall [Sat, 12 May 2018 06:18:42 +0000 (02:18 -0400)]
condition shrinkage when required
nhmall [Sat, 12 May 2018 05:10:43 +0000 (01:10 -0400)]
remove some debug code
nhmall [Sat, 12 May 2018 05:07:54 +0000 (01:07 -0400)]
missing return value
nhmall [Sat, 12 May 2018 05:04:57 +0000 (01:04 -0400)]
more tty-status updates
nhmall [Thu, 10 May 2018 22:54:58 +0000 (18:54 -0400)]
update files.c with testinglog
nhmall [Thu, 10 May 2018 22:48:02 +0000 (18:48 -0400)]
add some logging to debug
nhmall [Thu, 10 May 2018 14:05:29 +0000 (10:05 -0400)]
provide some debug developer controls - part 1
nhmall [Wed, 9 May 2018 22:51:49 +0000 (18:51 -0400)]
Revert "some cross platform testing"
This reverts commit
3d1e086648fa5657ee6181c8ae169af769d0e2c5.
nhmall [Wed, 9 May 2018 22:47:19 +0000 (18:47 -0400)]
cross platform testing
nhmall [Wed, 9 May 2018 22:31:18 +0000 (18:31 -0400)]
some cross platform testing
nhmall [Wed, 9 May 2018 22:07:52 +0000 (18:07 -0400)]
Merge branch 'barthouse-bugH7132' into NetHack-3.6.0
nhmall [Wed, 9 May 2018 17:25:46 +0000 (13:25 -0400)]
remove a commented out code line
nhmall [Wed, 9 May 2018 17:12:11 +0000 (13:12 -0400)]
tty status updates
some status code cleanup
It should be ready to merge tty-status changes into NetHack-3.6.0.
Bart House [Tue, 8 May 2018 14:25:24 +0000 (07:25 -0700)]
Fix for bug H7132.
In nethackw, there can be conflicts between menu accelerators and an extra
choice accelerator. For example, when engraving the using fingers options
conflicts with the unselect all menu accelerator. The extra choice
accelerator should take precedence.
nhmall [Tue, 8 May 2018 00:20:36 +0000 (20:20 -0400)]
optimization of output was ruining display effects
nhmall [Mon, 7 May 2018 22:52:50 +0000 (18:52 -0400)]
intermediate update to wintty.c as work continues
nhmall [Mon, 7 May 2018 12:41:54 +0000 (08:41 -0400)]
some status data corrections
nhmall [Sun, 6 May 2018 22:23:21 +0000 (18:23 -0400)]
Merge branch 'barhouse-lagFix' into tty-status
Bart House [Sun, 6 May 2018 08:13:30 +0000 (01:13 -0700)]
Implemented a fix to the lag problems that are occuring with the Win32
console port. The fix implements a console back buffer which
significantly reduces the number of calls made to WriteConsoleOutputXXX
and eliminates the lag users have been experiencing.
nhmall [Sun, 6 May 2018 21:52:29 +0000 (17:52 -0400)]
merge glitch cleanup
nhmall [Sun, 6 May 2018 20:52:11 +0000 (16:52 -0400)]
Merge branch 'lagfix' of https://github.com/barthouse/NetHackPublic into tty-status
Bart House [Sun, 6 May 2018 20:22:36 +0000 (13:22 -0700)]
Updated console back buffer support to correctly size the buffers as
appropriate.
nhmall [Sun, 6 May 2018 10:04:33 +0000 (06:04 -0400)]
more performance fixes for the port code portion
Bart House [Sun, 6 May 2018 09:47:17 +0000 (02:47 -0700)]
Console buffer support for variable size console windows.
nhmall [Sun, 6 May 2018 09:23:03 +0000 (05:23 -0400)]
Merge branch 'ghpr91' into tty-status
Bart House [Sun, 6 May 2018 08:40:13 +0000 (01:40 -0700)]
Quick fix to buffer height. Will need to determine why we needed a
buffer height of 26.
Bart House [Sun, 6 May 2018 08:13:30 +0000 (01:13 -0700)]
Implemented a fix to the lag problems that are occuring with the Win32
console port. The fix implements a console back buffer which
significantly reduces the number of calls made to WriteConsoleOutputXXX
and eliminates the lag users have been experiencing.
nhmall [Sun, 6 May 2018 00:42:55 +0000 (20:42 -0400)]
uncomment BETA for fix-test binary
nhmall [Sat, 5 May 2018 23:43:10 +0000 (19:43 -0400)]
do some performance optimizations on highlighting of tty status
nhmall [Sat, 28 Apr 2018 21:22:21 +0000 (17:22 -0400)]
last line of config file wasn't heeded if newline was missing
nhmall [Sat, 28 Apr 2018 16:11:19 +0000 (12:11 -0400)]
Specify both width and height when creating font for width testing
From Bart...
When we are creating the console font for testing character widths,
we were not specifying width. Because of this, the created font's
average width might be larger then what we expect and we might
falsely detect that the font was inappropriate for playing Nethack.
Fix provides the width that we are expecting when creating the font.
nhmall [Fri, 27 Apr 2018 03:02:17 +0000 (23:02 -0400)]
default to using latest SDK available on build machine
From Bart...
Modified build configuration to use latest SDK available by default.
This change will eliminate the need for us to hard code an SDK
version into our configuration file and will eliminate the need
for developers to set the SDK version when they do not have the
matching SDK version installed. Updated the Install.nt file removing
the mention of having to set the SDK version.
PatR [Thu, 26 Apr 2018 22:07:00 +0000 (15:07 -0700)]
display glitch: warning vs remembered,unseen
Noticed while testing the fix for the recently reported clairvoyance
bug. I saw a '1' move onto an 'I', then when it moved again the 'I'
reappeared. The remembered unseen monster couldn't be there anymore
if the warned-of monster was able to walk through that spot, so
remove any 'I' when showing a warning (digit) to stop remembering an
unseen monster at the warning spot.
Nobody has ever reported this so fixing it isn't urgent, but fixing
it is trivial so I'm doing it in now (without the clairvoyance fix).
nhmall [Thu, 26 Apr 2018 22:00:32 +0000 (18:00 -0400)]
windows-only bit
Alex Kompel [Thu, 26 Apr 2018 15:19:32 +0000 (08:19 -0700)]
win32-gui: fix message window text display
text dimension calculations were inconsistent across multiple functions.
this resulted in occassional text display oddities.
nhmall [Wed, 25 Apr 2018 23:56:39 +0000 (19:56 -0400)]
new Guidebook.txt
nhmall [Wed, 25 Apr 2018 23:26:35 +0000 (19:26 -0400)]
text bit in sys/unix/Makefile.dat
nhmall [Wed, 25 Apr 2018 22:59:58 +0000 (18:59 -0400)]
don't include fixes to post-3.6.0 code in count estimate
nhmall [Wed, 25 Apr 2018 21:56:14 +0000 (17:56 -0400)]
suppress version branch info if not BETA
I think this is needed to avoid inevitable questions/confusion.
Having the git hash in the version string of official binaries
is a very good thing, however.
nhmall [Wed, 25 Apr 2018 21:36:29 +0000 (17:36 -0400)]
Guidebook.tex bit spotted in test pdf generation
nhmall [Wed, 25 Apr 2018 21:11:28 +0000 (17:11 -0400)]
Update some dates and comment out BETA
nhmall [Wed, 25 Apr 2018 20:58:59 +0000 (16:58 -0400)]
Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0
nhmall [Wed, 25 Apr 2018 20:55:42 +0000 (16:55 -0400)]
fixes36.1 multi-line entries require leading tab after first line
keni [Wed, 25 Apr 2018 20:54:50 +0000 (16:54 -0400)]
add missing copyright info
keni [Wed, 25 Apr 2018 19:36:11 +0000 (15:36 -0400)]
force expand unexpanded substitution variables
keni [Wed, 25 Apr 2018 19:00:13 +0000 (15:00 -0400)]
Add updated copyright lines, part 1.
keni [Wed, 25 Apr 2018 18:52:43 +0000 (14:52 -0400)]
update .gitattributes files for substitution and copyright headers
Pasi Kallinen [Tue, 24 Apr 2018 16:04:42 +0000 (19:04 +0300)]
Allow defining file creation mask in hints file
nhmall [Tue, 24 Apr 2018 12:15:36 +0000 (08:15 -0400)]
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.
nhmall [Tue, 24 Apr 2018 01:47:46 +0000 (21:47 -0400)]
Install.nt bit
nhmall [Tue, 24 Apr 2018 01:38:36 +0000 (21:38 -0400)]
Update Guidebook.txt
nhmall [Tue, 24 Apr 2018 01:31:28 +0000 (21:31 -0400)]
Apr23 Guidebook date bump
PatR [Mon, 23 Apr 2018 23:08:57 +0000 (16:08 -0700)]
Guidebook...
Refine the recently added short description about how monsters are
displayed on the map.
Pasi Kallinen [Mon, 23 Apr 2018 16:49:30 +0000 (19:49 +0300)]
Mention boulder blocking path when traveling
...if mention_walls is on
PatR [Mon, 23 Apr 2018 07:57:31 +0000 (00:57 -0700)]
fix #H7079 - take two...
Instead of replacing the check for DRAWBRIDGE_UP with one for
DRAWBRIDGE_DOWN, the correct fix is to check for both because
replacing either one with water breaks the two-square dbridge.
PatR [Mon, 23 Apr 2018 07:39:57 +0000 (00:39 -0700)]
fix #H7079 - melting ice destroys lowered dbridge
melt_ice() attempted to handle this but checked for raised drawbridge
instead of lowered one.