summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells2.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2006-09-24 20:14:14 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2006-09-24 20:14:14 +0000
commit8ff8b514bd6f983e092b1ddddda6f29b5dd5197b (patch)
treeb9da152e8916d5eaa7e5935496a90a3616d3b8c8 /crawl-ref/source/spells2.cc
parent4896fc165af059b72aecc5b7f592d98bb38eadcd (diff)
downloadcrawl-ref-8ff8b514bd6f983e092b1ddddda6f29b5dd5197b.tar.gz
crawl-ref-8ff8b514bd6f983e092b1ddddda6f29b5dd5197b.zip
Made some more steps on the way to integrating itemprop.cc and
eliminating wpn-misc.cc. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@107 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r--crawl-ref/source/spells2.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 3f243dcaf0..0f249bb58e 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -557,7 +557,7 @@ bool brand_weapon(int which_brand, int power)
return false;
if (you.inv[wpn].base_type != OBJ_WEAPONS
- || launches_things(you.inv[wpn].sub_type))
+ || is_range_weapon(you.inv[wpn]))
{
return false;
}
@@ -573,7 +573,7 @@ bool brand_weapon(int which_brand, int power)
in_name( wpn, DESC_CAP_YOUR, str_pass );
strcpy( info, str_pass );
- const int wpn_type = damage_type(you.inv[wpn]);
+ const int wpn_type = get_vorpal_type(you.inv[wpn]);
switch (which_brand) // use SPECIAL_WEAPONS here?
{