From a6ac606f5217384d1b93d07926278e7a331de684 Mon Sep 17 00:00:00 2001 From: dolorous Date: Wed, 25 Feb 2009 23:48:56 +0000 Subject: Add miscellaneous minor fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9224 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/itemprop.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/itemprop.cc') diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index e5107c9f1a..cbfb90505d 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -817,8 +817,7 @@ void set_equip_desc( item_def &item, unsigned long flags ) // short get_helmet_desc( const item_def &item ) { - ASSERT( item.base_type == OBJ_ARMOUR - && get_armour_slot( item ) == EQ_HELMET ); + ASSERT( is_helmet(item) ); return item.plus2; } @@ -835,7 +834,7 @@ void set_helmet_desc( item_def &item, helmet_desc_type type ) bool is_helmet(const item_def& item) { - return item.base_type == OBJ_ARMOUR && get_armour_slot(item) == EQ_HELMET; + return (item.base_type == OBJ_ARMOUR && get_armour_slot(item) == EQ_HELMET); } bool is_hard_helmet(const item_def &item) -- cgit v1.2.3-54-g00ecf