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

glyph macro formatting

Browse Source 
Change some more
  (first_line <op> \
   second_line)
to
  (first_line \
   <op> second_line)
for various values of <op> besides '&&' and '||'.  Also clean up some
indentation and backslash+newline alignment.

For object_is_piletop() don't bother to validate that an object which
is classified as being on the floor is actually on the floor at its
specified map coordinates.  That check was propagating to expansions
of multiple macros and if it ever failed it would just be hiding a
very serious bug without helping to fix that.
This commit is contained in:
PatR
2022-07-16 15:36:25 -07:00
parent 94c1e94d20
commit 3ce02fedc8
2 changed files with 102 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/defsym.h
View File

@@ -96,8 +96,10 @@
PCHAR2( 2, '-', S_hwall, "horizontal wall", "wall", CLR(CLR_GRAY))
PCHAR2( 3, '-', S_tlcorn, "top left corner wall", "wall", CLR(CLR_GRAY))
PCHAR2( 4, '-', S_trcorn, "top right corner wall", "wall", CLR(CLR_GRAY))
PCHAR2( 5, '-', S_blcorn, "bottom left corner wall", "wall", CLR(CLR_GRAY))
PCHAR2( 6, '-', S_brcorn, "bottom right corner wall", "wall", CLR(CLR_GRAY))
PCHAR2( 5, '-', S_blcorn,
"bottom left corner wall", "wall", CLR(CLR_GRAY))
PCHAR2( 6, '-', S_brcorn,
"bottom right corner wall", "wall", CLR(CLR_GRAY))
PCHAR2( 7, '-', S_crwall, "cross wall", "wall", CLR(CLR_GRAY))
PCHAR2( 8, '-', S_tuwall, "tuwall", "wall", CLR(CLR_GRAY))
PCHAR2( 9, '-', S_tdwall, "tdwall", "wall", CLR(CLR_GRAY))
@@ -105,8 +107,10 @@
PCHAR2(11, '|', S_trwall, "trwall", "wall", CLR(CLR_GRAY))
/* start cmap A */
PCHAR2(12, '.', S_ndoor, "no door", "doorway", CLR(CLR_GRAY))
PCHAR2(13, '-', S_vodoor, "vertical open door", "open door", CLR(CLR_BROWN))
PCHAR2(14, '|', S_hodoor, "horizontal open door", "open door", CLR(CLR_BROWN))
PCHAR2(13, '-', S_vodoor,
"vertical open door", "open door", CLR(CLR_BROWN))
PCHAR2(14, '|', S_hodoor,
"horizontal open door", "open door", CLR(CLR_BROWN))
PCHAR2(15, '+', S_vcdoor,
"vertical closed door", "closed door", CLR(CLR_BROWN))
PCHAR2(16, '+', S_hcdoor,