summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/viewchar.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2010-11-09 16:16:05 +0100
committerAdam Borowski <kilobyte@angband.pl>2010-11-09 16:16:05 +0100
commitebfb02749fc10bd0ed8c358fcf06cd4dde1707c3 (patch)
tree86efdb906a91acff26f618ceac046be7dbcc0567 /crawl-ref/source/viewchar.cc
parentf7717330f1e10f18464a68edc1b595dd6a6b9527 (diff)
parent7a7d45293c51c7604d15147f7d5d4358162743f9 (diff)
downloadcrawl-ref-ebfb02749fc10bd0ed8c358fcf06cd4dde1707c3.tar.gz
crawl-ref-ebfb02749fc10bd0ed8c358fcf06cd4dde1707c3.zip
Merge branch 'master' into unicode
Diffstat (limited to 'crawl-ref/source/viewchar.cc')
-rw-r--r--crawl-ref/source/viewchar.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/crawl-ref/source/viewchar.cc b/crawl-ref/source/viewchar.cc
index 71bcac4067..dccb484bb7 100644
--- a/crawl-ref/source/viewchar.cc
+++ b/crawl-ref/source/viewchar.cc
@@ -13,7 +13,7 @@ static const unsigned dchar_table[ NUM_CSET ][ NUM_DCHAR_TYPES ] =
// CSET_ASCII
{
'#', '*', '.', ',', '\'', '+', '^', '>', '<', // wall .. stairs up
- '_', '\\', '}', '~', '8', '{', '{', // altar .. item detect
+ '#', '_', '\\', '}', '~', '8', '{', '{', // grate .. item detect
'0', ')', '[', '/', '%', '?', '=', '!', '(', // orb .. missile
':', '|', '}', '%', '$', '"', '#', '7', // book .. tree
' ', '!', '#', '%', ':', ')', '*', '+', // space .. fired_burst
@@ -23,7 +23,7 @@ static const unsigned dchar_table[ NUM_CSET ][ NUM_DCHAR_TYPES ] =
// CSET_IBM - this is ANSI 437
{
177, 176, 249, 250, '\'', 254, '^', '>', '<', // wall .. stairs up
- 220, 239, 244, 247, '8', '{', '{', // altar .. item detect
+ '#', 220, 239, 244, 247, '8', '{', '{', // grate .. item detect
'0', ')', '[', '/', '%', '?', '=', '!', '(', // orb .. missile
236, '\\', '}', '%', '$', '"', '#', 234, // book .. tree
' ', '!', '#', '%', '+', ')', '*', '+', // space .. fired_burst
@@ -34,7 +34,7 @@ static const unsigned dchar_table[ NUM_CSET ][ NUM_DCHAR_TYPES ] =
// It's better known as "vt100 line drawing characters".
{
225, 224, 254, ':', '\'', 238, '^', '>', '<', // wall .. stairs up
- 251, 182, 167, 187, '8', 171, 168, // altar .. item detect
+ '#', 251, 182, 167, 187, '8', 171, 168, // grate .. item detect
'0', ')', '[', '/', '%', '?', '=', '!', '(', // orb .. missile
':', '\\', '}', '%', '$', '"', '#', '7', // book .. tree
' ', '!', '#', '%', '+', ')', '*', '+', // space .. fired_burst
@@ -51,7 +51,7 @@ static const unsigned dchar_table[ NUM_CSET ][ NUM_DCHAR_TYPES ] =
*/
{
0x2592, 0x2591, 0xB7, 0x25E6, '\'', 0x25FC, '^', '>', '<',
- '_', 0x2229, 0x2320, 0x2248, '8', '{', 0x2206,
+ '#', '_', 0x2229, 0x2320, 0x2248, '8', '{', 0x2206,
'0', ')', '[', '/', '%', '?', '=', '!', '(',
0x221E, '|', '}', '%', '$', '"', '#', 0x2663,
' ', '!', '#', '%', '+', ')', '*', '+', // space .. fired_burst
@@ -64,8 +64,9 @@ dungeon_char_type dchar_by_name(const std::string &name)
const char *dchar_names[] =
{
"wall", "wall_magic", "floor", "floor_magic", "door_open",
- "door_closed", "trap", "stairs_down", "stairs_up", "altar", "arch",
- "fountain", "wavy", "statue", "invis_exposed", "item_detected",
+ "door_closed", "trap", "stairs_down", "stairs_up",
+ "grate", "altar", "arch", "fountain", "wavy", "statue",
+ "invis_exposed", "item_detected",
"item_orb", "item_weapon", "item_armour", "item_wand", "item_food",
"item_scroll", "item_ring", "item_potion", "item_missile", "item_book",
"item_stave", "item_miscellany", "item_corpse", "item_gold",