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-07-04 14:47:09 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-04 14:47:09 +0000
commitca98a8399e80e0fa440298a6ddf383d706343088 (patch)
treeefb9093515837fa9c2137965baf513cc447d308d /crawl-ref/source/itemprop.cc
parent7326d539ae67aba12e9a49dd94b2fe419845c759 (diff)
downloadcrawl-ref-ca98a8399e80e0fa440298a6ddf383d706343088.tar.gz
crawl-ref-ca98a8399e80e0fa440298a6ddf383d706343088.zip
Disallow vampires from draining summoned creatures to be consistent with
summoned creatures being incapable of bleeding on the floor. This makes things more difficult for Vampires; on the other hand there was a (more or less) recent change that lets them regain 1 hp *per turn* when draining corpses. We might also increase the duration of blood potions... Apart from that, various clean-ups. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6393 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
-rw-r--r--crawl-ref/source/itemprop.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 359ba8f0aa..90b166f487 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -804,11 +804,11 @@ void set_equip_race( item_def &item, unsigned long flags )
switch (item.base_type)
{
case OBJ_WEAPONS:
- if ((weapon_skill(item) == SK_LONG_BLADES
- && item.sub_type != WPN_FALCHION
- && item.sub_type != WPN_LONG_SWORD
- && item.sub_type != WPN_SCIMITAR
- && item.sub_type != WPN_GREAT_SWORD)
+ if (weapon_skill(item) == SK_LONG_BLADES
+ && item.sub_type != WPN_FALCHION
+ && item.sub_type != WPN_LONG_SWORD
+ && item.sub_type != WPN_SCIMITAR
+ && item.sub_type != WPN_GREAT_SWORD
|| item.sub_type == WPN_QUICK_BLADE
|| item.sub_type == WPN_LONGBOW
|| item.sub_type == WPN_HAND_CROSSBOW)
@@ -2337,7 +2337,7 @@ bool gives_ability( const item_def &item )
return (false);
}
-// Returns true if the item confers an intrinsic that is shown on the % screen.#
+// Returns true if the item confers an intrinsic that is shown on the % screen.
bool gives_resistance( const item_def &item )
{
if (!item_type_known(item))