summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/items.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-05-28 08:47:30 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-05-28 08:47:30 +0000
commit20a6609453ee2b51c388c296516c1abc1beab1d2 (patch)
tree201d735a3a4d66471005cb763078a6c05056752c /crawl-ref/source/items.cc
parent7aed4c41d7fa0f9d70df56a82abbe69061e56269 (diff)
downloadcrawl-ref-20a6609453ee2b51c388c296516c1abc1beab1d2.tar.gz
crawl-ref-20a6609453ee2b51c388c296516c1abc1beab1d2.zip
Preliminary integration of Zooko's Xom patch (untested).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1489 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/items.cc')
-rw-r--r--crawl-ref/source/items.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index cdaf9f4d97..59b04c9161 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -1119,7 +1119,7 @@ std::string origin_desc(const item_def &item)
break;
default:
if (iorig > GOD_NO_GOD && iorig < NUM_GODS)
- desc += std::string(god_name(iorig))
+ desc += std::string(god_name(static_cast<god_type>(iorig)))
+ " gifted " + article_it(item) + " to you ";
else
// Bug really.
@@ -3044,3 +3044,8 @@ int item_def::book_number() const
base_type == OBJ_STAVES? sub_type + 40 :
-1);
}
+
+bool item_def::cursed() const
+{
+ return (item_cursed(*this));
+}