summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-01-07 22:31:33 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-01-07 22:31:33 +0000
commit0710410f6d4155fafb7687f481d7a1876d320e1f (patch)
tree409aba025d820c7f55573a78974f0d3f8d04aca0
parent1a6236d61bcee1288e94595c4217920b339445b4 (diff)
downloadcrawl-ref-0710410f6d4155fafb7687f481d7a1876d320e1f.tar.gz
crawl-ref-0710410f6d4155fafb7687f481d7a1876d320e1f.zip
Added macro help file to the general help.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@799 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/command.cc2
-rw-r--r--crawl-ref/source/describe.cc1
2 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index d1c260f218..b9e9b73589 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -651,6 +651,7 @@ help_file help_files[] = {
{ "crawl_manual.txt", '*', true },
{ "tables.txt", '%', false },
{ "readme.txt", '^', false },
+ { "crawl_macros.txt", '~', false },
{ NULL, 0, false }
};
@@ -696,6 +697,7 @@ static void show_keyhelp_menu(const std::vector<formatted_string> &lines,
"<w>*</w>: Read the manual\n"
"<w>^</w>: Quickstart Guide\n"
"<w>:</w>: Browse Notes\n"
+ "<w>~</w>: Macros help\n"
"<w>%</w>: Table of Aptitudes\n",
true, true, cmdhelp_textfilter);
std::vector<formatted_string> blines = cols.formatted_lines();
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 9896a07113..f0f997464a 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -1719,7 +1719,6 @@ static std::string describe_armour( const item_def &item, bool verbose )
switch (get_equip_race( item ))
{
case ISFLAG_ELVEN:
- //jmf: not light
description += "$It is well-crafted and unobstructive";
if (item.sub_type == ARM_CLOAK || item.sub_type == ARM_BOOTS)