summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-11 03:41:33 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-11 03:41:33 +0000
commit2c2d8292ab0a6f2f7abfcd6bf7124368668a816f (patch)
tree9d7b77f14b28f6795d4f83a0214ace454d4538fe
parent3ad20fd115d195c77d856cd3d78f1a441154b24b (diff)
downloadcrawl-ref-2c2d8292ab0a6f2f7abfcd6bf7124368668a816f.tar.gz
crawl-ref-2c2d8292ab0a6f2f7abfcd6bf7124368668a816f.zip
Apply trunk r6488 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6489 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/item_use.cc2
-rw-r--r--crawl-ref/source/makeitem.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index af14f7570b..9eea4c276c 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2330,7 +2330,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
baseDam = property(item, PWPN_DAMAGE);
- // Dwarves/orcs with dwarven/orcish weapons.
+ // Dwarfs/orcs with dwarven/orcish weapons.
if (get_equip_race(item) == ISFLAG_DWARVEN
&& player_genus(GENPC_DWARVEN)
|| get_equip_race(item) == ISFLAG_ORCISH
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 9897f63201..25128edb68 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1666,7 +1666,7 @@ static item_status_flag_type _determine_missile_race(const item_def& item,
rc = ISFLAG_ORCISH;
}
- // Dwarves don't make arrows, sling bullets, javelins, or
+ // Dwarfs don't make arrows, sling bullets, javelins, or
// throwing nets.
if ((item.sub_type == MI_DART || item.sub_type == MI_BOLT)
&& one_chance_in(6))
@@ -1674,7 +1674,7 @@ static item_status_flag_type _determine_missile_race(const item_def& item,
rc = ISFLAG_DWARVEN;
}
- // Dwarves don't make needles.
+ // Dwarfs don't make needles.
if (item.sub_type == MI_NEEDLE)
{
if (one_chance_in(10))