diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-26 13:18:19 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-26 13:18:19 +0000 |
| commit | c96c36a0477909874c98bdbda3d13333ddb453e2 (patch) | |
| tree | 0c2a18233a65c55086d640be41685824c12d782e /crawl-ref/source/invent.cc | |
| parent | a2c2fe61d7f40cb8f5fecd84fdacfdf47d28f16a (diff) | |
| download | crawl-ref-c96c36a0477909874c98bdbda3d13333ddb453e2.tar.gz crawl-ref-c96c36a0477909874c98bdbda3d13333ddb453e2.zip | |
Implement FR 1894211: All transformations will now cause your equipment
to meld into your body than rather than being removed, so that when
untransforming you don't have to put everything on again.
* Wielded stuff cannot be melded, and does not yet use the autoswap
function.
* As before, the low-level transformation spells refuse to work with
cursed equipment.
* The messages are unnecessarily spammy if you change forms while
already transformed (first everything is re-equipped, then unequipped
again). Conversely, on simply untransforming the lack of messages
might be confusing.
* Might be buggy, feedback welcome!
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7300 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/invent.cc')
| -rw-r--r-- | crawl-ref/source/invent.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index fbef463669..b396e80fd3 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -800,11 +800,14 @@ std::vector<SelItem> select_items( const std::vector<const item_def*> &items, static bool _item_class_selected(const item_def &i, int selector) { const int itype = i.base_type; - if (selector == OSEL_ANY || selector == itype) + if (selector == OSEL_ANY || selector == itype && itype != OBJ_ARMOUR) return (true); switch (selector) { + case OBJ_ARMOUR: + return (you_tran_can_wear(i)); + case OSEL_UNIDENT: return !fully_identified(i); @@ -1105,7 +1108,7 @@ std::vector<SelItem> prompt_invent_items( } else if (!isspace( keyin )) { - // we've got a character we don't understand... + // We've got a character we don't understand... canned_msg( MSG_HUH ); } else |