summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/describe.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-22 18:05:50 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-22 18:05:50 +0000
commit03d0dc004fc0e97aea58665ea1b09f61afbf34f4 (patch)
treefbb5427aa24920bb0d55bf527f8ca75ac838cead /crawl-ref/source/describe.cc
parent2f0b704c918d91c1fccbb040dd1a472491b56ea8 (diff)
downloadcrawl-ref-03d0dc004fc0e97aea58665ea1b09f61afbf34f4.tar.gz
crawl-ref-03d0dc004fc0e97aea58665ea1b09f61afbf34f4.zip
For consistency with branded missile weapons, make branded missiles "of
flame" and "of frost" rather than "of flame" and "of ice". git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8697 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/describe.cc')
-rw-r--r--crawl-ref/source/describe.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 1498093b9c..ca3a3973a9 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -1187,7 +1187,7 @@ static std::string _describe_ammo( const item_def &item )
bool can_launch = has_launcher(item);
bool can_throw = is_throwable(&you, item, true);
bool need_new_line = true;
- bool always_destryoed = false;
+ bool always_destroyed = false;
if (item.special && item_type_known(item))
{
@@ -1209,9 +1209,9 @@ static std::string _describe_ammo( const item_def &item )
case SPMSL_FLAME:
bolt_name = "flame";
// Intentional fall-through
- case SPMSL_ICE:
+ case SPMSL_FROST:
if (bolt_name.empty())
- bolt_name = "ice";
+ bolt_name = "frost";
// Intentional fall-through
case SPMSL_CHAOS:
if (bolt_name.empty())
@@ -1233,7 +1233,7 @@ static std::string _describe_ammo( const item_def &item )
description += bolt_name;
description += ".";
- always_destryoed = true;
+ always_destroyed = true;
break;
case SPMSL_POISONED:
case SPMSL_POISONED_II:
@@ -1265,7 +1265,7 @@ static std::string _describe_ammo( const item_def &item )
description += "It will explode into fragemnets upon hitting "
"a target, hitting an obstruction, or reaching the end of "
"its range.";
- always_destryoed = true;
+ always_destroyed = true;
break;
case SPMSL_STEEL:
description += "Compared to normal ammo it does 50% more damage, "
@@ -1312,7 +1312,7 @@ static std::string _describe_ammo( const item_def &item )
}
}
- if (always_destryoed)
+ if (always_destroyed)
description += "$It will always be destroyed upon impact.";
else
append_missile_info(description);