nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'copperwater-3.7' of https://rodney.nethack.org:20040/git/NHsource into copperwater-3.7

Browse Source
This commit is contained in:
nhmall
2019-12-19 18:53:31 -05:00
parent 277dcc05b5 bcee4e694a
commit e3d8b93b10
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes37.0
View File

@@ -49,6 +49,7 @@ Platform- and/or Interface-Specific New Features
NetHack Community Patches (or Variation) Included NetHack Community Patches (or Variation) Included
------------------------------------------------- -------------------------------------------------
hallucinatory trap names from github pull request #174 hallucinatory trap names from github pull request #174
autounlock feature originally from unnethack in github pull request #228
Code Cleanup and Reorganization Code Cleanup and Reorganization

2
include/display.h
View File

@@ -334,7 +334,7 @@
#define explosion_to_glyph(expltype, idx) \ #define explosion_to_glyph(expltype, idx) \
((((expltype) * MAXEXPCHARS) + ((idx) - S_explode1)) + GLYPH_EXPLODE_OFF) ((((expltype) * MAXEXPCHARS) + ((idx) - S_explode1)) + GLYPH_EXPLODE_OFF)
#define trap_to_glyph(trap, rng) \ #define trap_to_glyph(trap) \
cmap_to_glyph(trap_to_defsym((trap)->ttyp)) cmap_to_glyph(trap_to_defsym((trap)->ttyp))
/* Not affected by hallucination. Gives a generic body for CORPSE */ /* Not affected by hallucination. Gives a generic body for CORPSE */