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-03 14:41:49 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-03 14:41:49 +0000
commit1ae786a89983b2c5511028e1ef894f5b7504eb04 (patch)
treeba5ca815c90e6a173bc9f4c3570d93b27a43442d /crawl-ref/source/itemprop.cc
parentcbb4198487aa2b7a3e59d5ad42d29bed2058ebbd (diff)
downloadcrawl-ref-1ae786a89983b2c5511028e1ef894f5b7504eb04.tar.gz
crawl-ref-1ae786a89983b2c5511028e1ef894f5b7504eb04.zip
Fix 2005590: Branded darts unbranded when thrown.
Thrown darts of ice or flame will correctly be displayed as puffs of frost/flame, will do the appropriate damage both to player and monsters and will be identified when thrown by a monster. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6367 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
-rw-r--r--crawl-ref/source/itemprop.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 88d89636ce..359ba8f0aa 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -930,7 +930,7 @@ int get_weapon_brand( const item_def &item )
int get_ammo_brand( const item_def &item )
{
- // no artefact arrows yet -- bwr
+ // No artefact arrows yet. -- bwr
if (item.base_type != OBJ_MISSILES || is_random_artefact( item ))
return (SPMSL_NORMAL);
@@ -2042,8 +2042,8 @@ launch_retval is_launched(actor *actor, const item_def *launcher,
return (LRET_LAUNCHED);
}
- return (is_throwable(missile, actor->body_size())?
- LRET_THROWN : LRET_FUMBLED);
+ return (is_throwable(missile, actor->body_size()) ? LRET_THROWN
+ : LRET_FUMBLED);
}
bool is_range_weapon_type( weapon_type wtype )