diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-24 20:14:14 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-24 20:14:14 +0000 |
| commit | 8ff8b514bd6f983e092b1ddddda6f29b5dd5197b (patch) | |
| tree | b9da152e8916d5eaa7e5935496a90a3616d3b8c8 /crawl-ref/source/describe.cc | |
| parent | 4896fc165af059b72aecc5b7f592d98bb38eadcd (diff) | |
| download | crawl-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/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 65deaa249f..0bcafcf040 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1040,7 +1040,7 @@ static std::string describe_weapon( const item_def &item, char verbose) } } - if (verbose == 1 && !launches_things( item.sub_type )) + if (verbose == 1 && !is_range_weapon( item )) { description += "$Damage rating: "; append_value(description, property( item, PWPN_DAMAGE ), false); @@ -1096,7 +1096,7 @@ static std::string describe_weapon( const item_def &item, char verbose) "all of orcish descent. "; break; case SPWPN_VENOM: - if (launches_things( item.sub_type )) + if (is_range_weapon(item)) description += "It poisons the unbranded ammo it fires. "; else description += "It poisons the flesh of those it strikes. "; @@ -1110,7 +1110,7 @@ static std::string describe_weapon( const item_def &item, char verbose) "it drains the life of those it strikes. "; break; case SPWPN_SPEED: - if (launches_things( item.sub_type )) + if (is_range_weapon(item)) { description += "It allows its wielder to fire twice when " "they would otherwise have fired only once. "; @@ -1122,7 +1122,7 @@ static std::string describe_weapon( const item_def &item, char verbose) } break; case SPWPN_VORPAL: - if (launches_things(item.sub_type)) + if (is_range_weapon(item)) { description += "Any "; description += ammo_name( item ); @@ -1191,7 +1191,7 @@ static std::string describe_weapon( const item_def &item, char verbose) description += "$It has a curse placed upon it."; } - if (verbose == 1 && !launches_things( item.sub_type )) + if (verbose == 1 && !is_range_weapon(item)) { #ifdef USE_NEW_COMBAT_STATS const int str_weight = weapon_str_weight( item.base_type, item.sub_type ); @@ -1230,7 +1230,7 @@ static std::string describe_weapon( const item_def &item, char verbose) break; } - if (launches_things( item.sub_type )) + if (is_range_weapon(item)) { switch (get_equip_race( item )) { |