TEXTCOLOR removal followup
Macros to conditionally include color fields in defsyms[] and objects[] are no longer needed. The one for mons[] was already gone but traces were present in a comment.
This commit is contained in:
PatR
231
include/defsym.h
231
include/defsym.h
@@ -30,12 +30,6 @@
|
|||||||
(define PCHAR_TILES prior to #include defsym.h).
|
(define PCHAR_TILES prior to #include defsym.h).
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CLR
|
|
||||||
#undef CLR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CLR(n) n
|
|
||||||
|
|
||||||
#if defined(PCHAR_S_ENUM) || defined(PCHAR_PARSE) \
|
#if defined(PCHAR_S_ENUM) || defined(PCHAR_PARSE) \
|
||||||
|| defined(PCHAR_DRAWING) || defined(PCHAR_TILES)
|
|| defined(PCHAR_DRAWING) || defined(PCHAR_TILES)
|
||||||
|
|
||||||
@@ -72,111 +66,104 @@
|
|||||||
#elif defined(PCHAR_TILES)
|
#elif defined(PCHAR_TILES)
|
||||||
/* win/share/tilemap.c */
|
/* win/share/tilemap.c */
|
||||||
#define PCHAR(idx, ch, sym, desc, clr) { sym, desc, desc },
|
#define PCHAR(idx, ch, sym, desc, clr) { sym, desc, desc },
|
||||||
|
#define PCHAR2(idx, ch, sym, tilenm, desc, clr) { sym, tilenm, desc },
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* PCHAR with extra arg */
|
/* PCHAR with extra arg */
|
||||||
#if defined(PCHAR_TILES)
|
#ifndef PCHAR2
|
||||||
#define PCHAR2(idx, ch, sym, tilenm, desc, clr) { sym, tilenm, desc },
|
|
||||||
#else
|
|
||||||
#define PCHAR2(idx, ch, sym, tilenm, desc, clr) PCHAR(idx, ch, sym, desc, clr)
|
#define PCHAR2(idx, ch, sym, tilenm, desc, clr) PCHAR(idx, ch, sym, desc, clr)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
PCHAR2( 0, ' ', S_stone, "dark part of a room", "stone", CLR(NO_COLOR))
|
PCHAR2( 0, ' ', S_stone, "dark part of a room", "stone", NO_COLOR)
|
||||||
PCHAR2( 1, '|', S_vwall, "vertical wall", "wall", CLR(CLR_GRAY))
|
PCHAR2( 1, '|', S_vwall, "vertical wall", "wall", CLR_GRAY)
|
||||||
PCHAR2( 2, '-', S_hwall, "horizontal wall", "wall", CLR(CLR_GRAY))
|
PCHAR2( 2, '-', S_hwall, "horizontal wall", "wall", CLR_GRAY)
|
||||||
PCHAR2( 3, '-', S_tlcorn, "top left corner wall", "wall", CLR(CLR_GRAY))
|
PCHAR2( 3, '-', S_tlcorn, "top left corner wall", "wall", CLR_GRAY)
|
||||||
PCHAR2( 4, '-', S_trcorn, "top right corner wall", "wall", CLR(CLR_GRAY))
|
PCHAR2( 4, '-', S_trcorn, "top right corner wall", "wall", CLR_GRAY)
|
||||||
PCHAR2( 5, '-', S_blcorn, "bottom left corner wall",
|
PCHAR2( 5, '-', S_blcorn, "bottom left corner wall", "wall", CLR_GRAY)
|
||||||
"wall", CLR(CLR_GRAY))
|
PCHAR2( 6, '-', S_brcorn, "bottom right corner wall", "wall", CLR_GRAY)
|
||||||
PCHAR2( 6, '-', S_brcorn, "bottom right corner wall",
|
PCHAR2( 7, '-', S_crwall, "cross wall", "wall", CLR_GRAY)
|
||||||
"wall", CLR(CLR_GRAY))
|
PCHAR2( 8, '-', S_tuwall, "tuwall", "wall", CLR_GRAY)
|
||||||
PCHAR2( 7, '-', S_crwall, "cross wall", "wall", CLR(CLR_GRAY))
|
PCHAR2( 9, '-', S_tdwall, "tdwall", "wall", CLR_GRAY)
|
||||||
PCHAR2( 8, '-', S_tuwall, "tuwall", "wall", CLR(CLR_GRAY))
|
PCHAR2(10, '|', S_tlwall, "tlwall", "wall", CLR_GRAY)
|
||||||
PCHAR2( 9, '-', S_tdwall, "tdwall", "wall", CLR(CLR_GRAY))
|
PCHAR2(11, '|', S_trwall, "trwall", "wall", CLR_GRAY)
|
||||||
PCHAR2(10, '|', S_tlwall, "tlwall", "wall", CLR(CLR_GRAY))
|
|
||||||
PCHAR2(11, '|', S_trwall, "trwall", "wall", CLR(CLR_GRAY))
|
|
||||||
/* start cmap A */
|
/* start cmap A */
|
||||||
PCHAR2(12, '.', S_ndoor, "no door", "doorway", CLR(CLR_GRAY))
|
PCHAR2(12, '.', S_ndoor, "no door", "doorway", CLR_GRAY)
|
||||||
PCHAR2(13, '-', S_vodoor, "vertical open door",
|
PCHAR2(13, '-', S_vodoor, "vertical open door", "open door", CLR_BROWN)
|
||||||
"open door", CLR(CLR_BROWN))
|
PCHAR2(14, '|', S_hodoor, "horizontal open door", "open door", CLR_BROWN)
|
||||||
PCHAR2(14, '|', S_hodoor, "horizontal open door",
|
|
||||||
"open door", CLR(CLR_BROWN))
|
|
||||||
PCHAR2(15, '+', S_vcdoor, "vertical closed door",
|
PCHAR2(15, '+', S_vcdoor, "vertical closed door",
|
||||||
"closed door", CLR(CLR_BROWN))
|
"closed door", CLR_BROWN)
|
||||||
PCHAR2(16, '+', S_hcdoor, "horizontal closed door",
|
PCHAR2(16, '+', S_hcdoor, "horizontal closed door",
|
||||||
"closed door", CLR(CLR_BROWN))
|
"closed door", CLR_BROWN)
|
||||||
PCHAR( 17, '#', S_bars, "iron bars", CLR(HI_METAL))
|
PCHAR( 17, '#', S_bars, "iron bars", HI_METAL)
|
||||||
PCHAR( 18, '#', S_tree, "tree", CLR(CLR_GREEN))
|
PCHAR( 18, '#', S_tree, "tree", CLR_GREEN)
|
||||||
PCHAR( 19, '.', S_room, "floor of a room", CLR(CLR_GRAY))
|
PCHAR( 19, '.', S_room, "floor of a room", CLR_GRAY)
|
||||||
PCHAR( 20, '.', S_darkroom, "dark part of a room", CLR(CLR_BLACK))
|
PCHAR( 20, '.', S_darkroom, "dark part of a room", CLR_BLACK)
|
||||||
PCHAR2(21, '`', S_engroom, "engraving in a room", "engraving",
|
PCHAR2(21, '`', S_engroom, "engraving in a room", "engraving",
|
||||||
CLR(CLR_BRIGHT_BLUE))
|
CLR_BRIGHT_BLUE)
|
||||||
PCHAR2(22, '#', S_corr, "dark corridor", "corridor", CLR(CLR_GRAY))
|
PCHAR2(22, '#', S_corr, "dark corridor", "corridor", CLR_GRAY)
|
||||||
PCHAR( 23, '#', S_litcorr, "lit corridor", CLR(CLR_GRAY))
|
PCHAR( 23, '#', S_litcorr, "lit corridor", CLR_GRAY)
|
||||||
PCHAR2(24, '#', S_engrcorr, "engraving in a corridor", "engraving",
|
PCHAR2(24, '#', S_engrcorr, "engraving in a corridor", "engraving",
|
||||||
CLR(CLR_BRIGHT_BLUE))
|
CLR_BRIGHT_BLUE)
|
||||||
PCHAR2(25, '<', S_upstair, "up stairs", "staircase up", CLR(CLR_GRAY))
|
PCHAR2(25, '<', S_upstair, "up stairs", "staircase up", CLR_GRAY)
|
||||||
PCHAR2(26, '>', S_dnstair, "down stairs", "staircase down", CLR(CLR_GRAY))
|
PCHAR2(26, '>', S_dnstair, "down stairs", "staircase down", CLR_GRAY)
|
||||||
PCHAR2(27, '<', S_upladder, "up ladder", "ladder up", CLR(CLR_BROWN))
|
PCHAR2(27, '<', S_upladder, "up ladder", "ladder up", CLR_BROWN)
|
||||||
PCHAR2(28, '>', S_dnladder, "down ladder", "ladder down", CLR(CLR_BROWN))
|
PCHAR2(28, '>', S_dnladder, "down ladder", "ladder down", CLR_BROWN)
|
||||||
PCHAR( 29, '<', S_brupstair, "branch staircase up", CLR(CLR_YELLOW))
|
PCHAR( 29, '<', S_brupstair, "branch staircase up", CLR_YELLOW)
|
||||||
PCHAR( 30, '>', S_brdnstair, "branch staircase down", CLR(CLR_YELLOW))
|
PCHAR( 30, '>', S_brdnstair, "branch staircase down", CLR_YELLOW)
|
||||||
PCHAR( 31, '<', S_brupladder, "branch ladder up", CLR(CLR_YELLOW))
|
PCHAR( 31, '<', S_brupladder, "branch ladder up", CLR_YELLOW)
|
||||||
PCHAR( 32, '>', S_brdnladder, "branch ladder down", CLR(CLR_YELLOW))
|
PCHAR( 32, '>', S_brdnladder, "branch ladder down", CLR_YELLOW)
|
||||||
/* end cmap A */
|
/* end cmap A */
|
||||||
PCHAR( 33, '_', S_altar, "altar", CLR(CLR_GRAY))
|
PCHAR( 33, '_', S_altar, "altar", CLR_GRAY)
|
||||||
/* start cmap B */
|
/* start cmap B */
|
||||||
PCHAR( 34, '|', S_grave, "grave", CLR(CLR_WHITE))
|
PCHAR( 34, '|', S_grave, "grave", CLR_WHITE)
|
||||||
PCHAR2(35, '\\', S_throne, "throne", "opulent throne", CLR(HI_GOLD))
|
PCHAR2(35, '\\', S_throne, "throne", "opulent throne", HI_GOLD)
|
||||||
PCHAR( 36, '{', S_sink, "sink", CLR(CLR_WHITE))
|
PCHAR( 36, '{', S_sink, "sink", CLR_WHITE)
|
||||||
PCHAR( 37, '{', S_fountain, "fountain", CLR(CLR_BRIGHT_BLUE))
|
PCHAR( 37, '{', S_fountain, "fountain", CLR_BRIGHT_BLUE)
|
||||||
PCHAR2(38, '}', S_pool, "pool", "water", CLR(CLR_BLUE))
|
PCHAR2(38, '}', S_pool, "pool", "water", CLR_BLUE)
|
||||||
PCHAR( 39, '.', S_ice, "ice", CLR(CLR_CYAN))
|
PCHAR( 39, '.', S_ice, "ice", CLR_CYAN)
|
||||||
PCHAR( 40, '}', S_lava, "molten lava", CLR(CLR_RED))
|
PCHAR( 40, '}', S_lava, "molten lava", CLR_RED)
|
||||||
PCHAR( 41, '}', S_lavawall, "wall of lava", CLR(CLR_ORANGE))
|
PCHAR( 41, '}', S_lavawall, "wall of lava", CLR_ORANGE)
|
||||||
PCHAR2(42, '.', S_vodbridge, "vertical open drawbridge",
|
PCHAR2(42, '.', S_vodbridge, "vertical open drawbridge",
|
||||||
"lowered drawbridge", CLR(CLR_BROWN))
|
"lowered drawbridge", CLR_BROWN)
|
||||||
PCHAR2(43, '.', S_hodbridge, "horizontal open drawbridge",
|
PCHAR2(43, '.', S_hodbridge, "horizontal open drawbridge",
|
||||||
"lowered drawbridge", CLR(CLR_BROWN))
|
"lowered drawbridge", CLR_BROWN)
|
||||||
PCHAR2(44, '#', S_vcdbridge, "vertical closed drawbridge",
|
PCHAR2(44, '#', S_vcdbridge, "vertical closed drawbridge",
|
||||||
"raised drawbridge", CLR(CLR_BROWN))
|
"raised drawbridge", CLR_BROWN)
|
||||||
PCHAR2(45, '#', S_hcdbridge, "horizontal closed drawbridge",
|
PCHAR2(45, '#', S_hcdbridge, "horizontal closed drawbridge",
|
||||||
"raised drawbridge", CLR(CLR_BROWN))
|
"raised drawbridge", CLR_BROWN)
|
||||||
PCHAR( 46, ' ', S_air, "air", CLR(CLR_CYAN))
|
PCHAR( 46, ' ', S_air, "air", CLR_CYAN)
|
||||||
PCHAR( 47, '#', S_cloud, "cloud", CLR(CLR_GRAY))
|
PCHAR( 47, '#', S_cloud, "cloud", CLR_GRAY)
|
||||||
PCHAR( 48, '}', S_water, "water", CLR(CLR_BRIGHT_BLUE))
|
PCHAR( 48, '}', S_water, "water", CLR_BRIGHT_BLUE)
|
||||||
/* end dungeon characters */
|
/* end dungeon characters */
|
||||||
/* */
|
/* */
|
||||||
/* begin traps */
|
/* begin traps */
|
||||||
/* */
|
/* */
|
||||||
PCHAR( 49, '^', S_arrow_trap, "arrow trap", CLR(HI_METAL))
|
PCHAR( 49, '^', S_arrow_trap, "arrow trap", HI_METAL)
|
||||||
PCHAR( 50, '^', S_dart_trap, "dart trap", CLR(HI_METAL))
|
PCHAR( 50, '^', S_dart_trap, "dart trap", HI_METAL)
|
||||||
PCHAR( 51, '^', S_falling_rock_trap, "falling rock trap", CLR(CLR_GRAY))
|
PCHAR( 51, '^', S_falling_rock_trap, "falling rock trap", CLR_GRAY)
|
||||||
PCHAR( 52, '^', S_squeaky_board, "squeaky board", CLR(CLR_BROWN))
|
PCHAR( 52, '^', S_squeaky_board, "squeaky board", CLR_BROWN)
|
||||||
PCHAR( 53, '^', S_bear_trap, "bear trap", CLR(HI_METAL))
|
PCHAR( 53, '^', S_bear_trap, "bear trap", HI_METAL)
|
||||||
PCHAR( 54, '^', S_land_mine, "land mine", CLR(CLR_RED))
|
PCHAR( 54, '^', S_land_mine, "land mine", CLR_RED)
|
||||||
PCHAR( 55, '^', S_rolling_boulder_trap, "rolling boulder trap",
|
PCHAR( 55, '^', S_rolling_boulder_trap, "rolling boulder trap", CLR_GRAY)
|
||||||
CLR(CLR_GRAY))
|
PCHAR( 56, '^', S_sleeping_gas_trap, "sleeping gas trap", HI_ZAP)
|
||||||
PCHAR( 56, '^', S_sleeping_gas_trap, "sleeping gas trap", CLR(HI_ZAP))
|
PCHAR( 57, '^', S_rust_trap, "rust trap", CLR_BLUE)
|
||||||
PCHAR( 57, '^', S_rust_trap, "rust trap", CLR(CLR_BLUE))
|
PCHAR( 58, '^', S_fire_trap, "fire trap", CLR_ORANGE)
|
||||||
PCHAR( 58, '^', S_fire_trap, "fire trap", CLR(CLR_ORANGE))
|
PCHAR( 59, '^', S_pit, "pit", CLR_BLACK)
|
||||||
PCHAR( 59, '^', S_pit, "pit", CLR(CLR_BLACK))
|
PCHAR( 60, '^', S_spiked_pit, "spiked pit", CLR_BLACK)
|
||||||
PCHAR( 60, '^', S_spiked_pit, "spiked pit", CLR(CLR_BLACK))
|
PCHAR( 61, '^', S_hole, "hole", CLR_BROWN)
|
||||||
PCHAR( 61, '^', S_hole, "hole", CLR(CLR_BROWN))
|
PCHAR( 62, '^', S_trap_door, "trap door", CLR_BROWN)
|
||||||
PCHAR( 62, '^', S_trap_door, "trap door", CLR(CLR_BROWN))
|
PCHAR( 63, '^', S_teleportation_trap, "teleportation trap", CLR_MAGENTA)
|
||||||
PCHAR( 63, '^', S_teleportation_trap, "teleportation trap",
|
PCHAR( 64, '^', S_level_teleporter, "level teleporter", CLR_MAGENTA)
|
||||||
CLR(CLR_MAGENTA))
|
PCHAR( 65, '^', S_magic_portal, "magic portal", CLR_BRIGHT_MAGENTA)
|
||||||
PCHAR( 64, '^', S_level_teleporter, "level teleporter", CLR(CLR_MAGENTA))
|
PCHAR( 66, '"', S_web, "web", CLR_GRAY)
|
||||||
PCHAR( 65, '^', S_magic_portal, "magic portal", CLR(CLR_BRIGHT_MAGENTA))
|
PCHAR( 67, '^', S_statue_trap, "statue trap", CLR_GRAY)
|
||||||
PCHAR( 66, '"', S_web, "web", CLR(CLR_GRAY))
|
PCHAR( 68, '^', S_magic_trap, "magic trap", HI_ZAP)
|
||||||
PCHAR( 67, '^', S_statue_trap, "statue trap", CLR(CLR_GRAY))
|
|
||||||
PCHAR( 68, '^', S_magic_trap, "magic trap", CLR(HI_ZAP))
|
|
||||||
PCHAR2(69, '^', S_anti_magic_trap, "anti magic trap", "anti-magic field",
|
PCHAR2(69, '^', S_anti_magic_trap, "anti magic trap", "anti-magic field",
|
||||||
CLR(HI_ZAP))
|
HI_ZAP)
|
||||||
PCHAR( 70, '^', S_polymorph_trap, "polymorph trap", CLR(CLR_BRIGHT_GREEN))
|
PCHAR( 70, '^', S_polymorph_trap, "polymorph trap", CLR_BRIGHT_GREEN)
|
||||||
PCHAR( 71, '~', S_vibrating_square, "vibrating square", CLR(CLR_MAGENTA))
|
PCHAR( 71, '~', S_vibrating_square, "vibrating square", CLR_MAGENTA)
|
||||||
PCHAR( 72, '^', S_trapped_door, "trapped door", CLR(CLR_ORANGE))
|
PCHAR( 72, '^', S_trapped_door, "trapped door", CLR_ORANGE)
|
||||||
PCHAR( 73, '^', S_trapped_chest, "trapped chest", CLR(CLR_ORANGE))
|
PCHAR( 73, '^', S_trapped_chest, "trapped chest", CLR_ORANGE)
|
||||||
/* end traps */
|
/* end traps */
|
||||||
/* end cmap B */
|
/* end cmap B */
|
||||||
/* */
|
/* */
|
||||||
@@ -184,22 +171,22 @@
|
|||||||
/* */
|
/* */
|
||||||
/* zap colors are changed by reset_glyphmap() to match type of beam */
|
/* zap colors are changed by reset_glyphmap() to match type of beam */
|
||||||
/* */
|
/* */
|
||||||
PCHAR2(74, '|', S_vbeam, "vertical beam", "", CLR(CLR_GRAY))
|
PCHAR2(74, '|', S_vbeam, "vertical beam", "", CLR_GRAY)
|
||||||
PCHAR2(75, '-', S_hbeam, "horizontal beam", "", CLR(CLR_GRAY))
|
PCHAR2(75, '-', S_hbeam, "horizontal beam", "", CLR_GRAY)
|
||||||
PCHAR2(76, '\\', S_lslant, "left slant beam", "", CLR(CLR_GRAY))
|
PCHAR2(76, '\\', S_lslant, "left slant beam", "", CLR_GRAY)
|
||||||
PCHAR2(77, '/', S_rslant, "right slant beam", "", CLR(CLR_GRAY))
|
PCHAR2(77, '/', S_rslant, "right slant beam", "", CLR_GRAY)
|
||||||
/* start cmap C */
|
/* start cmap C */
|
||||||
PCHAR2(78, '*', S_digbeam, "dig beam", "", CLR(CLR_WHITE))
|
PCHAR2(78, '*', S_digbeam, "dig beam", "", CLR_WHITE)
|
||||||
PCHAR2(79, '!', S_flashbeam, "flash beam", "", CLR(CLR_WHITE))
|
PCHAR2(79, '!', S_flashbeam, "flash beam", "", CLR_WHITE)
|
||||||
PCHAR2(80, ')', S_boomleft, "boom left", "", CLR(HI_WOOD))
|
PCHAR2(80, ')', S_boomleft, "boom left", "", HI_WOOD)
|
||||||
PCHAR2(81, '(', S_boomright, "boom right", "", CLR(HI_WOOD))
|
PCHAR2(81, '(', S_boomright, "boom right", "", HI_WOOD)
|
||||||
/* 4 magic shield symbols */
|
/* 4 magic shield symbols */
|
||||||
PCHAR2(82, '0', S_ss1, "shield1", "", CLR(HI_ZAP))
|
PCHAR2(82, '0', S_ss1, "shield1", "", HI_ZAP)
|
||||||
PCHAR2(83, '#', S_ss2, "shield2", "", CLR(HI_ZAP))
|
PCHAR2(83, '#', S_ss2, "shield2", "", HI_ZAP)
|
||||||
PCHAR2(84, '@', S_ss3, "shield3", "", CLR(HI_ZAP))
|
PCHAR2(84, '@', S_ss3, "shield3", "", HI_ZAP)
|
||||||
PCHAR2(85, '*', S_ss4, "shield4", "", CLR(HI_ZAP))
|
PCHAR2(85, '*', S_ss4, "shield4", "", HI_ZAP)
|
||||||
PCHAR( 86, '#', S_poisoncloud, "poison cloud", CLR(CLR_BRIGHT_GREEN))
|
PCHAR( 86, '#', S_poisoncloud, "poison cloud", CLR_BRIGHT_GREEN)
|
||||||
PCHAR( 87, '?', S_goodpos, "valid position", CLR(CLR_BRIGHT_GREEN))
|
PCHAR( 87, '?', S_goodpos, "valid position", CLR_BRIGHT_GREEN)
|
||||||
/* end cmap C */
|
/* end cmap C */
|
||||||
/* */
|
/* */
|
||||||
/* The 8 swallow symbols. Do NOT separate. */
|
/* The 8 swallow symbols. Do NOT separate. */
|
||||||
@@ -213,14 +200,14 @@
|
|||||||
/* 4 5 6 */
|
/* 4 5 6 */
|
||||||
/* 7 8 9 */
|
/* 7 8 9 */
|
||||||
/* */
|
/* */
|
||||||
PCHAR2(88, '/', S_sw_tl, "swallow top left", "", CLR(CLR_GREEN)) /*1*/
|
PCHAR2(88, '/', S_sw_tl, "swallow top left", "", CLR_GREEN) /*1*/
|
||||||
PCHAR2(89, '-', S_sw_tc, "swallow top center", "", CLR(CLR_GREEN)) /*2*/
|
PCHAR2(89, '-', S_sw_tc, "swallow top center", "", CLR_GREEN) /*2*/
|
||||||
PCHAR2(90, '\\', S_sw_tr, "swallow top right", "", CLR(CLR_GREEN)) /*3*/
|
PCHAR2(90, '\\', S_sw_tr, "swallow top right", "", CLR_GREEN) /*3*/
|
||||||
PCHAR2(91, '|', S_sw_ml, "swallow middle left", "", CLR(CLR_GREEN)) /*4*/
|
PCHAR2(91, '|', S_sw_ml, "swallow middle left", "", CLR_GREEN) /*4*/
|
||||||
PCHAR2(92, '|', S_sw_mr, "swallow middle right", "", CLR(CLR_GREEN)) /*6*/
|
PCHAR2(92, '|', S_sw_mr, "swallow middle right", "", CLR_GREEN) /*6*/
|
||||||
PCHAR2(93, '\\', S_sw_bl, "swallow bottom left", "", CLR(CLR_GREEN)) /*7*/
|
PCHAR2(93, '\\', S_sw_bl, "swallow bottom left", "", CLR_GREEN) /*7*/
|
||||||
PCHAR2(94, '-', S_sw_bc, "swallow bottom center", "", CLR(CLR_GREEN))/*8*/
|
PCHAR2(94, '-', S_sw_bc, "swallow bottom center", "", CLR_GREEN) /*8*/
|
||||||
PCHAR2(95, '/', S_sw_br, "swallow bottom right", "", CLR(CLR_GREEN)) /*9*/
|
PCHAR2(95, '/', S_sw_br, "swallow bottom right", "", CLR_GREEN) /*9*/
|
||||||
/* */
|
/* */
|
||||||
/* explosion colors are changed by reset_glyphmap() to match */
|
/* explosion colors are changed by reset_glyphmap() to match */
|
||||||
/* the type of expl. */
|
/* the type of expl. */
|
||||||
@@ -231,15 +218,15 @@
|
|||||||
/* |@| */
|
/* |@| */
|
||||||
/* \-/ */
|
/* \-/ */
|
||||||
/* */
|
/* */
|
||||||
PCHAR2(96, '/', S_expl_tl, "explosion top left", "", CLR(CLR_ORANGE))
|
PCHAR2(96, '/', S_expl_tl, "explosion top left", "", CLR_ORANGE)
|
||||||
PCHAR2(97, '-', S_expl_tc, "explosion top center", "", CLR(CLR_ORANGE))
|
PCHAR2(97, '-', S_expl_tc, "explosion top center", "", CLR_ORANGE)
|
||||||
PCHAR2(98, '\\', S_expl_tr, "explosion top right", "", CLR(CLR_ORANGE))
|
PCHAR2(98, '\\', S_expl_tr, "explosion top right", "", CLR_ORANGE)
|
||||||
PCHAR2(99, '|', S_expl_ml, "explosion middle left", "", CLR(CLR_ORANGE))
|
PCHAR2(99, '|', S_expl_ml, "explosion middle left", "", CLR_ORANGE)
|
||||||
PCHAR2(100, ' ', S_expl_mc, "explosion middle center", "", CLR(CLR_ORANGE))
|
PCHAR2(100, ' ', S_expl_mc, "explosion middle center", "", CLR_ORANGE)
|
||||||
PCHAR2(101, '|', S_expl_mr, "explosion middle right", "", CLR(CLR_ORANGE))
|
PCHAR2(101, '|', S_expl_mr, "explosion middle right", "", CLR_ORANGE)
|
||||||
PCHAR2(102, '\\', S_expl_bl, "explosion bottom left", "", CLR(CLR_ORANGE))
|
PCHAR2(102, '\\', S_expl_bl, "explosion bottom left", "", CLR_ORANGE)
|
||||||
PCHAR2(103, '-', S_expl_bc, "explosion bottom center", "", CLR(CLR_ORANGE))
|
PCHAR2(103, '-', S_expl_bc, "explosion bottom center", "", CLR_ORANGE)
|
||||||
PCHAR2(104, '/', S_expl_br, "explosion bottom right", "", CLR(CLR_ORANGE))
|
PCHAR2(104, '/', S_expl_br, "explosion bottom right", "", CLR_ORANGE)
|
||||||
#undef PCHAR
|
#undef PCHAR
|
||||||
#undef PCHAR2
|
#undef PCHAR2
|
||||||
#endif /* PCHAR_S_ENUM || PCHAR_PARSE || PCHAR_DRAWING || PCHAR_TILES */
|
#endif /* PCHAR_S_ENUM || PCHAR_PARSE || PCHAR_DRAWING || PCHAR_TILES */
|
||||||
@@ -439,8 +426,6 @@
|
|||||||
#endif /* OBJCLASS_S_ENUM || OBJCLASS_DEFCHAR_ENUM || OBJCLASS_CLASS_ENUM
|
#endif /* OBJCLASS_S_ENUM || OBJCLASS_DEFCHAR_ENUM || OBJCLASS_CLASS_ENUM
|
||||||
* || OBJCLASS_PARSE || OBJCLASS_DRAWING */
|
* || OBJCLASS_PARSE || OBJCLASS_DRAWING */
|
||||||
|
|
||||||
#undef CLR
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
#if !defined(PCHAR_S_ENUM) && !defined(PCHAR_DRAWING) \
|
#if !defined(PCHAR_S_ENUM) && !defined(PCHAR_DRAWING) \
|
||||||
&& !defined(PCHAR_PARSE) && !defined(PCHAR_TILES) \
|
&& !defined(PCHAR_PARSE) && !defined(PCHAR_TILES) \
|
||||||
@@ -451,6 +436,6 @@
|
|||||||
&& !defined (OBJCLASS_DRAWING)
|
&& !defined (OBJCLASS_DRAWING)
|
||||||
#error Non-productive inclusion of defsym.h
|
#error Non-productive inclusion of defsym.h
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif /* DEBUG */
|
||||||
|
|
||||||
/* end of defsym.h */
|
/* end of defsym.h */
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
/* NetHack 3.7 monsters.h $NHDT-Date: 1691877846 2023/08/12 22:04:06 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.110 $ */
|
/* NetHack 3.7 monsters.h $NHDT-Date: 1700725870 2023/11/23 07:51:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.113 $ */
|
||||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||||
/*-Copyright (c) Michael Allison, 2006. */
|
/*-Copyright (c) Michael Allison, 2006. */
|
||||||
/* NetHack may be freely redistributed. See license for details. */
|
/* NetHack may be freely redistributed. See license for details. */
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
* sounds made (MS_* defines), physical size (MZ_* defines),
|
* sounds made (MS_* defines), physical size (MZ_* defines),
|
||||||
* resistances, resistances conferred (both MR_* defines),
|
* resistances, resistances conferred (both MR_* defines),
|
||||||
* 3 * flag bitmaps (M1_*, M2_*, and M3_* defines respectively),
|
* 3 * flag bitmaps (M1_*, M2_*, and M3_* defines respectively),
|
||||||
* difficulty, symbol color (C(x) macro).
|
* difficulty, symbol color.
|
||||||
*
|
*
|
||||||
* The difficulty was generated in separate array monstr[] with
|
* The difficulty was generated in separate array monstr[] with
|
||||||
* values calculated by makedefs, but has been moved into mons[]
|
* values calculated by makedefs, but has been moved into mons[]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
/* NetHack 3.7 objects.h $NHDT-Date: 1596498192 2020/08/03 23:43:12 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.66 $ */
|
/* NetHack 3.7 objects.h $NHDT-Date: 1700725879 2023/11/23 07:51:19 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.20 $ */
|
||||||
/* Copyright (c) Mike Threepoint, 1989. */
|
/* Copyright (c) Mike Threepoint, 1989. */
|
||||||
/* NetHack may be freely redistributed. See license for details. */
|
/* NetHack may be freely redistributed. See license for details. */
|
||||||
|
|
||||||
@@ -35,7 +35,6 @@
|
|||||||
#define MARKER(tag,sn) /*empty*/
|
#define MARKER(tag,sn) /*empty*/
|
||||||
|
|
||||||
#elif defined(OBJECTS_INIT)
|
#elif defined(OBJECTS_INIT)
|
||||||
#define COLOR_FIELD(X) X,
|
|
||||||
/* notes: 'sub' was once a bitfield but got changed to separate schar when
|
/* notes: 'sub' was once a bitfield but got changed to separate schar when
|
||||||
it was overloaded to hold negative weapon skill indices; the first zero
|
it was overloaded to hold negative weapon skill indices; the first zero
|
||||||
is padding for oc_prediscovered which has variable init at run-time;
|
is padding for oc_prediscovered which has variable init at run-time;
|
||||||
@@ -44,7 +43,7 @@
|
|||||||
nmkn,mrg,uskn,0,mgc,chrg,uniq,nwsh,big,tuf,0,dir,mtrl,sub /*cpp fodder*/
|
nmkn,mrg,uskn,0,mgc,chrg,uniq,nwsh,big,tuf,0,dir,mtrl,sub /*cpp fodder*/
|
||||||
#define OBJECT(obj,bits,prp,sym,prob,dly,wt, \
|
#define OBJECT(obj,bits,prp,sym,prob,dly,wt, \
|
||||||
cost,sdam,ldam,oc1,oc2,nut,color,sn) \
|
cost,sdam,ldam,oc1,oc2,nut,color,sn) \
|
||||||
{ 0, 0, (char *) 0, bits, prp, sym, dly, COLOR_FIELD(color) prob, wt, \
|
{ 0, 0, (char *) 0, bits, prp, sym, dly, color, prob, wt, \
|
||||||
cost, sdam, ldam, oc1, oc2, nut }
|
cost, sdam, ldam, oc1, oc2, nut }
|
||||||
#define MARKER(tag,sn) /*empty*/
|
#define MARKER(tag,sn) /*empty*/
|
||||||
|
|
||||||
@@ -1616,7 +1615,6 @@ OBJECT(OBJ(NoDes, NoDes),
|
|||||||
BITS(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, P_NONE, 0), 0,
|
BITS(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, P_NONE, 0), 0,
|
||||||
ILLOBJ_CLASS, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
|
ILLOBJ_CLASS, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
|
||||||
#undef BITS
|
#undef BITS
|
||||||
#undef COLOR_FIELD
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#undef OBJ
|
#undef OBJ
|
||||||
|
|||||||
Reference in New Issue
Block a user