rename explosion symbols

Use a slightly more meaningful name for each one rather than
a sequential numerical name.

S_explode1 to S_expl_tl
S_explode2 to S_expl_tc
S_explode3 to S_expl_tr
S_explode4 to S_expl_ml
S_explode5 to S_expl_mc
S_explode6 to S_expl_mr
S_explode7 to S_expl_bl
S_explode8 to S_expl_bc
S_explode9 to S_expl_br
This commit is contained in:
nhmall
2021-09-18 10:04:25 -04:00
parent 22b2ef8f2b
commit 9b57784348
9 changed files with 74 additions and 65 deletions

View File

@@ -221,15 +221,15 @@
/* |@| */
/* \-/ */
/* */
PCHAR2(91, '/', S_explode1, "explosion top left", "", CLR(CLR_ORANGE))
PCHAR2(92, '-', S_explode2, "explosion top center", "", CLR(CLR_ORANGE))
PCHAR2(93, '\\', S_explode3, "explosion top right", "", CLR(CLR_ORANGE))
PCHAR2(94, '|', S_explode4, "explosion middle left", "", CLR(CLR_ORANGE))
PCHAR2(95, ' ', S_explode5, "explosion middle center", "", CLR(CLR_ORANGE))
PCHAR2(96, '|', S_explode6, "explosion middle right", "", CLR(CLR_ORANGE))
PCHAR2(97, '\\', S_explode7, "explosion bottom left", "", CLR(CLR_ORANGE))
PCHAR2(98, '-', S_explode8, "explosion bottom center", "", CLR(CLR_ORANGE))
PCHAR2(99, '/', S_explode9, "explosion bottom right", "", CLR(CLR_ORANGE))
PCHAR2(91, '/', S_expl_tl, "explosion top left", "", CLR(CLR_ORANGE))
PCHAR2(92, '-', S_expl_tc, "explosion top center", "", CLR(CLR_ORANGE))
PCHAR2(93, '\\', S_expl_tr, "explosion top right", "", CLR(CLR_ORANGE))
PCHAR2(94, '|', S_expl_ml, "explosion middle left", "", CLR(CLR_ORANGE))
PCHAR2(95, ' ', S_expl_mc, "explosion middle center", "", CLR(CLR_ORANGE))
PCHAR2(96, '|', S_expl_mr, "explosion middle right", "", CLR(CLR_ORANGE))
PCHAR2(97, '\\', S_expl_bl, "explosion bottom left", "", CLR(CLR_ORANGE))
PCHAR2(98, '-', S_expl_bc, "explosion bottom center", "", CLR(CLR_ORANGE))
PCHAR2(99, '/', S_expl_br, "explosion bottom right", "", CLR(CLR_ORANGE))
#undef PCHAR
#undef PCHAR2
#endif /* PCHAR_S_ENUM || PCHAR_PARSE || PCHAR_DRAWING || PCHAR_TILES */

View File

@@ -379,7 +379,7 @@ enum explosion_types {
#define cmap_to_glyph(cmap_idx) ((int) (cmap_idx) + GLYPH_CMAP_OFF)
#define explosion_to_glyph(expltype, idx) \
((((expltype) * MAXEXPCHARS) + ((idx) - S_explode1)) + GLYPH_EXPLODE_OFF)
((((expltype) * MAXEXPCHARS) + ((idx) - S_expl_tl)) + GLYPH_EXPLODE_OFF)
#define trap_to_glyph(trap) \
cmap_to_glyph(trap_to_defsym((trap)->ttyp))

View File

@@ -76,7 +76,7 @@ struct symsetentry {
#define MAXDCHARS (S_water - S_stone + 1) /* mapped dungeon characters */
#define MAXTCHARS (S_vibrating_square - S_arrow_trap + 1) /* trap chars */
#define MAXECHARS (S_explode9 - S_vbeam + 1) /* mapped effects characters */
#define MAXECHARS (S_expl_br - S_vbeam + 1) /* mapped effects characters */
#define MAXEXPCHARS 9 /* number of explosion characters */
#define DARKROOMSYM (Is_rogue_level(&u.uz) ? S_stone : S_darkroom)