diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 20:43:17 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 20:43:17 +0000 |
| commit | dc0f066ad0fa14a48e652914b9a27e626f5eded1 (patch) | |
| tree | 83173474fa7ecc57c9c6bb974445cb47d5d341e0 /crawl-ref/source/invent.cc | |
| parent | d976570ee5fbcc53481d76b2d55d389908968bd5 (diff) | |
| download | crawl-ref-dc0f066ad0fa14a48e652914b9a27e626f5eded1.tar.gz crawl-ref-dc0f066ad0fa14a48e652914b9a27e626f5eded1.zip | |
Apply commits r6564 and r6567 to 0.4 trunk.
Also start on changes.stone_soup for 0.4.1. The mapmark.lua fixes are
not actually in 0.4 trunk, are they?
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6568 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/invent.cc')
| -rw-r--r-- | crawl-ref/source/invent.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index c2e766f470..bc39a7d3b3 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -335,6 +335,8 @@ static std::string _no_selectables_message(int item_selector) case OSEL_WIELD: case OBJ_WEAPONS: return("You aren't carrying any weapons."); + case OBJ_ARMOUR: + return("You aren't carrying any armour."); case OSEL_UNIDENT: return("You don't have any unidentified items."); case OSEL_MEMORISE: @@ -342,7 +344,6 @@ static std::string _no_selectables_message(int item_selector) case OSEL_RECHARGE: return("You aren't carrying any rechargable items."); case OSEL_ENCH_ARM: - case OBJ_ARMOUR: return("You aren't carrying any armour which can be enchanted " "further."); case OBJ_CORPSES: |