summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/describe.h
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-11-22 08:41:20 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-11-22 08:41:20 +0000
commit1d0f57cbceb778139ca215cc4fcfd1584951f6dd (patch)
treecafd60c944c51fcce778aa5d6912bc548c518339 /crawl-ref/source/describe.h
parent6f5e187a9e5cd348296dba2fd89d2e206e775a01 (diff)
downloadcrawl-ref-1d0f57cbceb778139ca215cc4fcfd1584951f6dd.tar.gz
crawl-ref-1d0f57cbceb778139ca215cc4fcfd1584951f6dd.zip
Merged stone_soup r15:451 into trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@452 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/describe.h')
-rw-r--r--crawl-ref/source/describe.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/source/describe.h b/crawl-ref/source/describe.h
index 981f90ce01..9128c27555 100644
--- a/crawl-ref/source/describe.h
+++ b/crawl-ref/source/describe.h
@@ -4,6 +4,8 @@
* Summary: Functions used to print information about various game objects.
* Written by: Linley Henzell
*
+ * Modified for Crawl Reference by $Author$ on $Date$
+ *
* Change History (most recent first):
*
* <2> 5/21/99 BWR Changed from is_artifact to is_dumpable_artifact
@@ -15,18 +17,19 @@
#include <string>
#include "externs.h"
+#include "enum.h"
// last updated 12may2000 {dlb}
/* ***********************************************************************
* called from: chardump - spells4
* *********************************************************************** */
-bool is_dumpable_artifact( const item_def &item, char verbose );
+bool is_dumpable_artifact( const item_def &item, bool verbose );
// last updated 12may2000 {dlb}
/* ***********************************************************************
* called from: chardump - describe
* *********************************************************************** */
-std::string get_item_description( const item_def &item, char verbose,
+std::string get_item_description( const item_def &item, bool verbose,
bool dump = false );
// last updated 12may2000 {dlb}
@@ -61,4 +64,6 @@ void describe_spell(int spelled);
* *********************************************************************** */
std::string ghost_description(bool concise = false);
+const char *trap_name(trap_type trap);
+
#endif