summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-26 03:23:24 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-26 03:23:24 +0000
commit2d8d61996db55457432517ffc1d59bbdd6312f2c (patch)
tree8eb8ac1969d09aac456c6c5b32e524bafc10151f
parentd6a4e4b51c3e8525f22b93553fce9ebae2a62dd8 (diff)
downloadcrawl-ref-2d8d61996db55457432517ffc1d59bbdd6312f2c.tar.gz
crawl-ref-2d8d61996db55457432517ffc1d59bbdd6312f2c.zip
Add miscellaneous minor fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9695 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/docs/changes.stone_soup2
-rw-r--r--crawl-ref/source/transfor.cc6
2 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index d3b2c274dd..bc7a9b1657 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -129,7 +129,7 @@ Items
* ?immolation doesn't burn scrolls anymore.
* ?summoning creates a permanent abomination.
* ?random uselessness autoidentifies.
-* ?vorpalise weapon fixes temporary brands instead of Echant Weapon III.
+* ?vorpalise weapon fixes temporary brands instead of Enchant Weapon III.
* Nemelex-gifted decks identify after drawing one card.
* Decks of punishment are no longer randomly generated.
* Removing rings of levitation or invisibility no longer cancels the effect.
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index 3eb69e744c..45535efdac 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -167,8 +167,10 @@ static void _remove_equipment(const std::set<equipment_type>& removed,
bool unequip = (e == EQ_WEAPON || !meld);
- mprf("%s %s", equip->name(DESC_CAP_YOUR).c_str(),
- (unequip ? "falls away!" : "melds into your body."));
+ mprf("%s %s%s %s", equip->name(DESC_CAP_YOUR).c_str(),
+ unequip ? "fall" : "meld",
+ equip->quantity > 1 ? "" : "s",
+ unequip ? "away!" : "into your body.");
_unwear_equipment_slot(e);