summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemprop.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-27 11:59:31 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-27 11:59:31 +0000
commitb49f34292556d8d6d239cc57aba8068bb22cf751 (patch)
tree9a5cd858677c9b7975a097f96c5853e591a8111c /crawl-ref/source/itemprop.cc
parentf3ece5fe657885c0488a536404ba9164db4aeedf (diff)
downloadcrawl-ref-b49f34292556d8d6d239cc57aba8068bb22cf751.tar.gz
crawl-ref-b49f34292556d8d6d239cc57aba8068bb22cf751.zip
Rewrite of item_def::name() (the old itemname()). Much, much cleaner now.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1376 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
-rw-r--r--crawl-ref/source/itemprop.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 06d048d4a2..0b96e69de2 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -710,7 +710,7 @@ int get_ammo_brand( const item_def &item )
return (item.special);
}
-int get_armour_ego_type( const item_def &item )
+special_armour_type get_armour_ego_type( const item_def &item )
{
// artefact armours have no ego type, must look up powers separately
if (item.base_type != OBJ_ARMOUR
@@ -719,7 +719,7 @@ int get_armour_ego_type( const item_def &item )
return (SPARM_NORMAL);
}
- return (item.special);
+ return (static_cast<special_armour_type>(item.special));
}
//