summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemprop.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-16 14:58:51 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-16 14:58:51 +0000
commit42acab0b7d5738062a3d4efc83002d9ad890381f (patch)
treee56f08883a15f1ee79ee5ff234512a25208b433e /crawl-ref/source/itemprop.cc
parente2e74507bbc5ce16bad61bedc0bd881acdbea280 (diff)
downloadcrawl-ref-42acab0b7d5738062a3d4efc83002d9ad890381f.tar.gz
crawl-ref-42acab0b7d5738062a3d4efc83002d9ad890381f.zip
Don't change beam names for tracers. (Fixes 1994978.)
Clean up the vampire ability screen a bit. Special case naga bardings of running (according to makeitem.cc they can exist) to be called "naga barding of speedy slithering" instead. Yes, it's a hack, and yes, the name is rather unwieldy, but it makes more sense this way. I hope. :p git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5880 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
-rw-r--r--crawl-ref/source/itemprop.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 34307c39ea..4cfe2fd891 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -1295,7 +1295,7 @@ bool check_armour_shape( const item_def &item, bool quiet )
}
else
{
- // Note: some transformation include all of the above as well
+ // Note: Some transformations include all of the above as well.
if (item.sub_type == ARM_NAGA_BARDING
|| item.sub_type == ARM_CENTAUR_BARDING)
{
@@ -1573,7 +1573,7 @@ hands_reqd_type hands_reqd( const item_def &item, size_type size )
ret = HANDS_TWO;
break;
- case OBJ_ARMOUR: // barding and body armours are unwieldy
+ case OBJ_ARMOUR: // Bardings and body armours are unwieldy.
if (item.sub_type == ARM_NAGA_BARDING
|| item.sub_type == ARM_CENTAUR_BARDING
|| get_armour_slot( item ) == EQ_BODY_ARMOUR)
@@ -2582,7 +2582,7 @@ size_type item_size( const item_def &item )
size = SIZE_SMALL;
break;
- default: // body armours and bardings
+ default: // Body armours and bardings.
size = SIZE_MEDIUM;
break;
}
@@ -2641,8 +2641,8 @@ bool is_colourful_item( const item_def &item )
bool is_shield(const item_def &item)
{
- return item.base_type == OBJ_ARMOUR
- && get_armour_slot(item) == EQ_SHIELD;
+ return (item.base_type == OBJ_ARMOUR
+ && get_armour_slot(item) == EQ_SHIELD);
}
// Returns true if the given item cannot be wielded with the given shield.