From: nhmall Date: Wed, 3 Feb 2016 12:27:12 +0000 (-0500) Subject: macro symbols instead of numbers for maintenance X-Git-Tag: NetHack-3.6.1_RC01~957 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff9682b549489ae960349b6ac3f675d57e49ea67;p=nethack macro symbols instead of numbers for maintenance --- diff --git a/win/share/tilemap.c b/win/share/tilemap.c index 9c1ac1b33..d743c549c 100644 --- a/win/share/tilemap.c +++ b/win/share/tilemap.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 tilemap.c $NHDT-Date: 1454498706 2016/02/03 11:25:06 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.27 $ */ +/* NetHack 3.6 tilemap.c $NHDT-Date: 1454502429 2016/02/03 12:27:09 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.28 $ */ /* NetHack may be freely redistributed. See license for details. */ /* @@ -516,102 +516,102 @@ struct { const char *betterlabel; const char *expectedlabel; } altlabels[] = { - {0, "dark part of a room", "dark part of a room"}, - {1, "vertical wall", "wall"}, - {2, "horizontal wall", "wall"}, - {3, "top left corner wall", "wall"}, - {4, "top right corner wall", "wall"}, - {5, "bottom left corner wall", "wall"}, - {6, "bottom right corner wall", "wall"}, - {7, "cross wall", "wall"}, - {8, "tuwall", "wall"}, - {9, "tdwall", "wall"}, - {10, "tlwall", "wall"}, - {11, "trwall", "wall"}, - {12, "no door", "doorway"}, - {13, "vertical open door", "open door"}, - {14, "horizontal open door", "open door"}, - {15, "vertical closed door", "closed door"}, - {16, "horizontal closed door", "closed door"}, - {17, "iron bars", "iron bars"}, - {18, "tree", "tree"}, - {19, "room", "floor of a room"}, - {20, "darkroom", "dark part of a room"}, - {21, "corridor", "corridor"}, - {22, "lit corridor", "lit corridor"}, - {23, "up stairs", "staircase up"}, - {24, "down stairs", "staircase down"}, - {25, "up ladder", "ladder up"}, - {26, "down ladder", "ladder down"}, - {27, "altar", "altar"}, - {28, "grave", "grave"}, - {29, "throne", "opulent throne"}, - {30, "sink", "sink"}, - {31, "fountain", "fountain"}, - {32, "pool", "water"}, - {33, "ice", "ice"}, - {34, "lava", "molten lava"}, - {35, "vertical open drawbridge", "lowered drawbridge"}, - {36, "horizontal open drawbridge", "lowered drawbridge"}, - {37, "vertical closed drawbridge", "raised drawbridge"}, - {38, "horizontal closed drawbridge", "raised drawbridge"}, - {39, "air", "air"}, - {40, "cloud", "cloud"}, - {41, "water", "water"}, - {42, "arrow trap", "arrow trap"}, - {43, "dart trap", "dart trap"}, - {44, "falling rock trap", "falling rock trap"}, - {45, "squeaky board", "squeaky board"}, - {46, "bear trap", "bear trap"}, - {47, "land mine", "land mine"}, - {48, "rolling boulder trap", "rolling boulder trap"}, - {49, "sleeping gas trap", "sleeping gas trap"}, - {50, "rust trap", "rust trap"}, - {51, "fire trap", "fire trap"}, - {52, "pit", "pit"}, - {53, "spiked pit", "spiked pit"}, - {54, "hole", "hole"}, - {55, "trap door", "trap door"}, - {56, "teleportation trap", "teleportation trap"}, - {57, "level teleporter", "level teleporter"}, - {58, "magic portal", "magic portal"}, - {59, "web", "web"}, - {60, "statue trap", "statue trap"}, - {61, "magic trap", "magic trap"}, - {62, "anti magic trap", "anti-magic field"}, - {63, "polymorph trap", "polymorph trap"}, - {64, "vibrating square", "vibrating square"}, - {65, "vertical beam", "wall"}, - {66, "horizontal beam", "wall"}, - {67, "left slant beam", "wall"}, - {68, "right slant beam", "wall"}, - {69, "dig beam", "cmap 69"}, - {70, "flash beam", "cmap 70"}, - {71, "boom left", "cmap 71"}, - {72, "boom right", "cmap 72"}, - {73, "shield1", "cmap 73"}, - {74, "shield2", "cmap 74"}, - {75, "shield3", "cmap 75"}, - {76, "shield4", "cmap 76"}, - {77, "poison cloud", "poison cloud"}, - {78, "valid position", "valid position"}, - {79, "swallow top left", "cmap 79"}, - {80, "swallow top center", "cmap 80"}, - {81, "swallow top right", "cmap 81"}, - {82, "swallow middle left", "cmap 82"}, - {83, "swallow middle right", "cmap 83"}, - {84, "swallow bottom left ", "cmap 84"}, - {85, "swallow bottom center", "cmap 85"}, - {86, "swallow bottom right", "cmap 86"}, - {87, "explosion top left", "explosion dark 0"}, - {88, "explosion top centre", "explosion dark 1"}, - {89, "explosion top right", "explosion dark 2"}, - {90, "explosion middle left", "explosion dark 3"}, - {91, "explosion middle center", "explosion dark 4"}, - {92, "explosion middle right", "explosion dark 5"}, - {93, "explosion bottom left", "explosion dark 6"}, - {94, "explosion bottom center", "explosion dark 7"}, - {95, "explosion bottom right", "explosion dark 8"}, +{S_stone, "dark part of a room", "dark part of a room"}, +{S_vwall, "vertical wall", "wall"}, +{S_hwall, "horizontal wall", "wall"}, +{S_tlcorn, "top left corner wall", "wall"}, +{S_trcorn, "top right corner wall", "wall"}, +{S_blcorn, "bottom left corner wall", "wall"}, +{S_brcorn, "bottom right corner wall", "wall"}, +{S_crwall, "cross wall", "wall"}, +{S_tuwall, "tuwall", "wall"}, +{S_tdwall, "tdwall", "wall"}, +{S_tlwall, "tlwall", "wall"}, +{S_trwall, "trwall", "wall"}, +{S_ndoor, "no door", "doorway"}, +{S_vodoor, "vertical open door", "open door"}, +{S_hodoor, "horizontal open door", "open door"}, +{S_vcdoor, "vertical closed door", "closed door"}, +{S_hcdoor, "horizontal closed door", "closed door"}, +{S_bars, "iron bars", "iron bars"}, +{S_tree, "tree", "tree"}, +{S_room, "room", "floor of a room"}, +{S_darkroom, "darkroom", "dark part of a room"}, +{S_corr, "corridor", "corridor"}, +{S_litcorr, "lit corridor", "lit corridor"}, +{S_upstair, "up stairs", "staircase up"}, +{S_dnstair, "down stairs", "staircase down"}, +{S_upladder, "up ladder", "ladder up"}, +{S_dnladder, "down ladder", "ladder down"}, +{S_altar, "altar", "altar"}, +{S_grave, "grave", "grave"}, +{S_throne, "throne", "opulent throne"}, +{S_sink, "sink", "sink"}, +{S_fountain, "fountain", "fountain"}, +{S_pool, "pool", "water"}, +{S_ice, "ice", "ice"}, +{S_lava, "lava", "molten lava"}, +{S_vodbridge, "vertical open drawbridge", "lowered drawbridge"}, +{S_hodbridge, "horizontal open drawbridge", "lowered drawbridge"}, +{S_vcdbridge, "vertical closed drawbridge", "raised drawbridge"}, +{S_hcdbridge, "horizontal closed drawbridge", "raised drawbridge"}, +{S_air, "air", "air"}, +{S_cloud, "cloud", "cloud"}, +{S_water, "water", "water"}, +{S_arrow_trap, "arrow trap", "arrow trap"}, +{S_dart_trap, "dart trap", "dart trap"}, +{S_falling_rock_trap, "falling rock trap", "falling rock trap"}, +{S_squeaky_board, "squeaky board", "squeaky board"}, +{S_bear_trap, "bear trap", "bear trap"}, +{S_land_mine, "land mine", "land mine"}, +{S_rolling_boulder_trap, "rolling boulder trap", "rolling boulder trap"}, +{S_sleeping_gas_trap, "sleeping gas trap", "sleeping gas trap"}, +{S_rust_trap, "rust trap", "rust trap"}, +{S_fire_trap, "fire trap", "fire trap"}, +{S_pit, "pit", "pit"}, +{S_spiked_pit, "spiked pit", "spiked pit"}, +{S_hole, "hole", "hole"}, +{S_trap_door, "trap door", "trap door"}, +{S_teleportation_trap, "teleportation trap", "teleportation trap"}, +{S_level_teleporter, "level teleporter", "level teleporter"}, +{S_magic_portal, "magic portal", "magic portal"}, +{S_web, "web", "web"}, +{S_statue_trap, "statue trap", "statue trap"}, +{S_magic_trap, "magic trap", "magic trap"}, +{S_anti_magic_trap, "anti magic trap", "anti-magic field"}, +{S_polymorph_trap, "polymorph trap", "polymorph trap"}, +{S_vibrating_square, "vibrating square", "vibrating square"}, +{S_vbeam, "vertical beam", "wall"}, +{S_hbeam, "horizontal beam", "wall"}, +{S_lslant, "left slant beam", "wall"}, +{S_rslant, "right slant beam", "wall"}, +{S_digbeam, "dig beam", "cmap 69"}, +{S_flashbeam, "flash beam", "cmap 70"}, +{S_boomleft, "boom left", "cmap 71"}, +{S_boomright, "boom right", "cmap 72"}, +{S_ss1, "shield1", "cmap 73"}, +{S_ss2, "shield2", "cmap 74"}, +{S_ss3, "shield3", "cmap 75"}, +{S_ss4, "shield4", "cmap 76"}, +{S_poisoncloud, "poison cloud", "poison cloud"}, +{S_goodpos, "valid position", "valid position"}, +{S_sw_tl, "swallow top left", "cmap 79"}, +{S_sw_tc, "swallow top center", "cmap 80"}, +{S_sw_tr, "swallow top right", "cmap 81"}, +{S_sw_ml, "swallow middle left", "cmap 82"}, +{S_sw_mr, "swallow middle right", "cmap 83"}, +{S_sw_bl, "swallow bottom left ", "cmap 84"}, +{S_sw_bc, "swallow bottom center", "cmap 85"}, +{S_sw_br, "swallow bottom right", "cmap 86"}, +{S_explode1, "explosion top left", "explosion dark 0"}, +{S_explode2, "explosion top centre", "explosion dark 1"}, +{S_explode3, "explosion top right", "explosion dark 2"}, +{S_explode4, "explosion middle left", "explosion dark 3"}, +{S_explode5, "explosion middle center", "explosion dark 4"}, +{S_explode6, "explosion middle right", "explosion dark 5"}, +{S_explode7, "explosion bottom left", "explosion dark 6"}, +{S_explode8, "explosion bottom center", "explosion dark 7"}, +{S_explode9, "explosion bottom right", "explosion dark 8"}, }; boolean