Commit Graph
7108 Commits
Author SHA1 Message Date
nhmall 2b66b5ecd1 bump version ID values 2018-05-16 23:06:44 -04:00
PatR fa0a136b06 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.
2018-05-15 17:09:47 -07:00
PatR d752a4ad93 X11/winX.c w/o TEXTCOLOR
Avoid warnings when TEXTCOLOR isn't enabled.
2018-05-15 17:08:40 -07:00
PatR 1ecb2c1e79 mapglyph.c w/o TEXTCOLOR
Avoid warnings when TEXTCOLOR isn't enabled.
2018-05-15 17:06:51 -07:00
nhmall 8dc2c59796 fixes36.2 catch-up for previous commit 2018-05-15 19:41:12 -04:00
nhmall 821399c6be fix access violation when --debug:xxxx has no other args after it 2018-05-15 19:39:05 -04:00
nhmall 88f5dcbfb4 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
2018-05-15 19:35:36 -04:00
keni f810a45dc1 fix H7138: sys/unix/setup.sh fails with no arguments
Sanity check was in the wrong place.
2018-05-15 16:30:28 -04:00
nhmall c2103b84db fix a couple of status items, gold highlighting and a boundary check
typo
gold highlighting
boundary check on tty_curs()
2018-05-15 09:03:35 -04:00
PatR 5586cca8b9 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.
2018-05-15 04:16:40 -07:00
PatR fc75055263 debug logging
Remove unused variables.
2018-05-15 04:15:41 -07:00
nhmall 504f0a4510 integrate aklys feature introduced in 3.6.1 into 3.6.x display 2018-05-15 06:41:06 -04:00
nhmall 64a771da4b add prototype
(cherry picked from commit 438cfd3815)
2018-05-15 06:31:22 -04:00
nhmall cc1d43fad4 integrate aklys feature introduced in 3.6.1 into display
(cherry picked from commit 3fe8325f14)
2018-05-15 06:29:40 -04:00
nhmall 340ff13a1d Merge branch 'win-minor' into NetHack-3.6.0 2018-05-15 01:30:31 -04:00
nhmall 80218a7855 boundary bit 2018-05-15 01:29:36 -04:00
nhmall aaddab5450 catch up on fixes36.2 updates 2018-05-15 01:10:32 -04:00
nhmall f36c3ae1ab Merge branch 'win-minor' into NetHack-3.6.0 2018-05-15 00:27:11 -04:00
nhmall 589bdb4e2d Merge branch 'win-tty-status' into win-minor 2018-05-15 00:26:26 -04:00
nhmall 26654ef079 a few cut-and-paste errors 2018-05-14 22:25:25 -04:00
nhmall 2e8b69d5ff some tty per field rendering and optimization 2018-05-14 21:13:37 -04:00
nhmall fba7c06fd6 put back the functionality of commandline --debug:immediateflips overwritten recently 2018-05-14 21:09:01 -04:00
Bart House 1f877dbca1 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.
2018-05-13 20:46:43 -07:00
Bart House 53c7cb8c78 Changes to xputc_core to handle cursor correctly. 2018-05-13 18:54:20 -07:00
nhmall 860b9c35c1 testing build with STATUS_HILITES 2018-05-13 21:24:14 -04:00
nhmall 2b8ac8af9e missing stubs for NetHackW.exe 2018-05-13 16:42:11 -04:00
Bart House 0afd2570cb Removing temporary debugging code and fixing compiler warnings. 2018-05-13 13:29:13 -07:00
Bart House 3dbbd188d9 Fixing typo. 2018-05-13 12:49:52 -07:00
nhmall 0d23e7b44d Merge branch 'tty-status' into win-tty-status 2018-05-13 15:21:46 -04:00
nhmall 3b2f7e86e0 more status updates
- prevent an overflow
- add make_things_fit()
2018-05-13 15:19:39 -04:00
Bart House 650d5230ec Fix memory leak. See bug 1169. 2018-05-12 19:45:16 -07:00
PatR f89968a973 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.
2018-05-12 18:50:51 -07:00
PatR 45c59857f7 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.
2018-05-12 18:47:34 -07:00
Bart House 039687cf5f 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.
2018-05-12 18:06:23 -07:00
Bart House 1d31a49661 Some nttty.c clean-up. 2018-05-12 15:58:44 -07:00
Bart House 3467b9f087 Added ntassert() mechanism for Windows based port use. 2018-05-12 13:59:06 -07:00
nhmall 99474c864f Merge branch 'tty-status' into win-tty-status 2018-05-12 14:44:12 -04:00
nhmall 149fc5a4dd empty field suppression caught condition values unintentionally 2018-05-12 14:42:19 -04:00
nhmall 3598fcc929 more status handling updates
Suppress unneeded spaces from a couple of fields
	BL_LEVELDESC	- trailing spaces.
	BL_CAP		- it only contains a space
2018-05-12 14:10:52 -04:00
nhmall 9a87064cca some build fixes for compile issues reported 2018-05-12 06:57:34 -04:00
nhmall ba057ef3de condition shrinkage when required 2018-05-12 02:18:42 -04:00
nhmall a3ba46d732 remove some debug code 2018-05-12 01:10:43 -04:00
nhmall d0e508241b missing return value 2018-05-12 01:07:54 -04:00
nhmall dd04f5fcb5 more tty-status updates 2018-05-12 01:04:57 -04:00
nhmall 04c85aa59d update files.c with testinglog 2018-05-10 18:54:58 -04:00
nhmall 8c2dc7bb1c add some logging to debug 2018-05-10 18:48:02 -04:00
nhmall 702154529f provide some debug developer controls - part 1 2018-05-10 10:05:29 -04:00
nhmall 1a19e449c7 Revert "some cross platform testing"
This reverts commit 3d1e086648.
2018-05-09 18:51:49 -04:00
nhmall 4dd535cbd2 cross platform testing 2018-05-09 18:47:19 -04:00
nhmall 3d1e086648 some cross platform testing 2018-05-09 18:31:18 -04:00