Commit Graph

9733 Commits

Author SHA1 Message Date
nhmall
6716cb4587 Merge branch 'master' into NetHack-3.7 2019-12-02 07:54:13 -05:00
nhmall
0e12640def Merge branch 'NetHack-3.6' 2019-12-02 07:53:57 -05:00
nhw_cron
103ad2521d This is cron-daily v1-Dec-1-2019. files updated: Files 2019-12-02 07:50:17 -05:00
nhmall
3d484f4d4d cut-and-paste correction 2019-12-01 22:31:09 -05:00
nhmall
0db4ddcd5b update Cross-compiling text 2019-12-01 22:25:34 -05:00
nhmall
5e5217aceb more versioning bits 2019-12-01 19:38:47 -05:00
PatR
1603267cfa lua version bit 2019-12-01 16:33:01 -08:00
nhmall
a9c946a05f Merge branch 'NetHack-3.6' 2019-12-01 19:30:09 -05:00
nhmall
5de24d2a0d follow-up bit 2019-12-01 19:11:12 -05:00
nhmall
d2d40289e6 update and/or clarify some version references 2019-12-01 19:07:28 -05:00
nhmall
de5580f96e Merge branch 'NetHack-3.6' 2019-12-01 16:49:47 -05:00
PatR
839597eb59 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.
2019-12-01 07:38:01 -08:00
nhmall
689039b9d7 Merge branch 'NetHack-3.6' part 2 2019-11-30 23:52:39 -05:00
nhmall
3a59b7f210 Merge branch 'NetHack-3.6' 2019-11-30 23:48:03 -05:00
PatR
8f06974414 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.
2019-11-30 20:19:10 -08:00
nhmall
3497946074 yet-another has_color 2019-11-30 22:20:03 -05:00
PatR
b7689128e7 mdlib.c tweaks
Eliminate a couple of warnings about unused static routines.
That led to a couple of other things.

I hope I got host vs target right in the mdlib.c '#if's.
2019-11-30 16:59:35 -08:00
nhmall
ef59ceaabc Makefile.utl bit 2019-11-30 19:18:00 -05:00
nhmall
2a2021d5e4 use the copyright statement provided by the Lua distribution in lua.h 2019-11-30 18:43:57 -05:00
nhmall
719ca3003e remove variable left over from earlier testing 2019-11-30 17:34:10 -05:00
nhmall
c5babb0de1 instance_globals update to include lua_ver storage 2019-11-30 17:24:11 -05:00
nhmall
7031b6b504 get lua version from lua itself 2019-11-30 17:23:14 -05:00
nhmall
4c16417c45 Merge branch 'NetHack-3.6' 2019-11-30 15:53:38 -05:00
nhmall
d2d2887cbc leave option setting as previous (it was not part of the change) 2019-11-30 15:51:58 -05:00
nhmall
3a84bff7f3 Merge branch 'NetHack-3.6' 2019-11-30 15:41:52 -05:00
nhmall
e8ef02d597 one more win_proc 2019-11-30 15:27:04 -05:00
nhmall
31cfe76b67 build with TEXTCOLOR undef'd turned up a couple of things
Also, one more has_color in obsolete sys/mac folder. Adjusted code.
2019-11-30 15:05:48 -05:00
nhmall
0843c5d922 some dead code eliminations and a couple of documentation updates 2019-11-30 13:35:14 -05:00
nhmall
42a13a1198 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.
2019-11-30 11:44:07 -05:00
nhmall
c9a741ffd3 more Windows Makefile adjustments 2019-11-29 22:40:30 -05:00
nhmall
4535a57aba Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7 2019-11-29 22:40:06 -05:00
nhmall
004ac4bb49 insert Lua version
Instead of the hardcoded value that's in this right at the moment,
the intention is to get the Lua version information directly from
Lua itself for the insertion. For now, this will have to do.
2019-11-29 22:37:30 -05:00
PatR
756f6a1006 fix a memory leak
Memory allocated for a trap in getlev() wasn't being freed.  There
is already one extra allocation which is supposed to get freed after
the loop, but the 'keepgoing' flag caused an extra trap allocation
before loop termination.  So the unintentional one got freed but did
so by intercepting the free for the end-of-list one.

Fruit had similar code which applied to full game save and restore
rather than level save and restore so wasn't as noticeable.
2019-11-29 18:31:45 -08:00
nhmall
dd1d978b84 a couple of very minor follow-up bits 2019-11-29 21:19:31 -05:00
PatR
5226726c99 more lua notice from makedefs.c to mdlib.c
Add missing dependency of makedefs needing src/mdlib.c to unix
Makefile.src.
2019-11-29 17:19:37 -08:00
PatR
769799105c move lua notice to makedefs.c and dat/options
Prefix the lua notice with a one-line explanation.  One minor change:
the copyright date didn't match the one from the actual lua notice.
2019-11-29 16:05:14 -08:00
PatR
099fdca8cd no longer used variable 2019-11-29 15:59:50 -08:00
PatR
10359c7bee build fix for unix
Add src/mdlib.[co] to Makefile.src.  Dependencies for mklib.o have
been added manually rather than via 'make depend'.
2019-11-29 15:58:03 -08:00
nhmall
e13e166620 get rid of LUA_INTCAST defines 2019-11-29 17:40:58 -05:00
nhmall
453745701f casting lua_tointeger 2019-11-29 17:38:51 -05:00
nhmall
f41530bea8 Merge branch 'master' into NetHack-3.7 2019-11-29 17:01:29 -05:00
nhmall
8cd73c8cc9 Merge branch 'NetHack-3.6' 2019-11-29 16:57:23 -05:00
Pasi Kallinen
f8a1059a87 Read lua files more efficiently
... replacing horribly hacky loop.
2019-11-29 21:49:03 +02:00
PatR
49e4dfbc0f 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)) {
                                                  ~~ ^~~~~~~~~~~~~~
2019-11-29 11:38:42 -08:00
nhmall
97a61e2e95 move fixes entry to correct section 2019-11-29 12:05:21 -05:00
nhmall
fd7d0f5d52 more things considered when you're on the brink 2019-11-29 11:14:55 -05:00
nhmall
2954608a39 another Windows Makefile bit
Ensure the tools build whether a CROSSCOMPILE_HOST build, or
when there is no CROSSCOMPILE.
2019-11-28 23:36:15 -05:00
nhmall
381b8b4fcb updated sfdata.c 2019-11-28 22:50:28 -05:00
nhmall
acffbfcfc8 Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7 2019-11-28 22:49:25 -05:00
nhmall
ff39e44276 resolve 48 warning building on Mac OS X 2019-11-28 22:48:57 -05:00