diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-24 16:13:54 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-24 16:13:54 +0000 |
| commit | 9e0e937aa69c91a0b299a8f561564776bf2ab153 (patch) | |
| tree | 518a1d46db4280ac5bfd7dce034f0ebc62a251a4 /crawl-ref/source/itemprop.cc | |
| parent | 9bec932ccdd73db4bab274c36acf0cb9de818b88 (diff) | |
| download | crawl-ref-9e0e937aa69c91a0b299a8f561564776bf2ab153.tar.gz crawl-ref-9e0e937aa69c91a0b299a8f561564776bf2ab153.zip | |
Fix 1923913: blood spattering into fountains
Fix 1923487: jewelled helmets getting the "jewelled" randart description
Fix 1923471: Suppress the beholding message if only attacking.
Also remove ARM_HELM since it's identical in every way with ARM_HELMET
and only serves to confuse coders.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3858 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 14851779d4..a518f8970e 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -124,8 +124,6 @@ static armour_def Armour_prop[NUM_ARMOURS] = { ARM_HELMET, "helmet", 1, 0, 80, false, EQ_HELMET, SIZE_SMALL, SIZE_MEDIUM }, - { ARM_HELM, "helm", 1, 0, 80, - false, EQ_HELMET, SIZE_SMALL, SIZE_MEDIUM }, { ARM_CAP, "cap", 0, 0, 40, true, EQ_HELMET, SIZE_LITTLE, SIZE_LARGE }, @@ -817,9 +815,7 @@ bool is_helmet(const item_def& item) bool is_hard_helmet(const item_def &item) { - return (item.base_type == OBJ_ARMOUR - && (item.sub_type == ARM_HELMET || - item.sub_type == ARM_HELM)); + return (item.base_type == OBJ_ARMOUR && item.sub_type == ARM_HELMET); } void set_helmet_random_desc( item_def &item ) @@ -2404,11 +2400,11 @@ size_type item_size( const item_def &item ) case OBJ_ARMOUR: size = SIZE_MEDIUM; + switch (item.sub_type) { case ARM_GLOVES: case ARM_HELMET: - case ARM_HELM: case ARM_CAP: case ARM_WIZARD_HAT: case ARM_BOOTS: |