diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2014-04-09 18:13:10 +0100 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2014-04-09 18:13:10 +0100 |
| commit | 43eea485f30f77c41b07869c13a833d5e8ab18d5 (patch) | |
| tree | 7a27e25d2264a4f358108653c5d5984f954d6d88 /crawl-ref/source/player-equip.cc | |
| parent | f14b194d65fcea22da142024ae67792f1fa5b310 (diff) | |
| download | crawl-ref-43eea485f30f77c41b07869c13a833d5e8ab18d5.tar.gz crawl-ref-43eea485f30f77c41b07869c13a833d5e8ab18d5.zip | |
Make skill training restrictions depend on carried instead of equipped items
For Shields in particular, carrying a shield is sufficient for training
purposes. Remove a number of now-unnecessary checks, including some checks
that were already obsolete for curses on wielded weapons.
Diffstat (limited to 'crawl-ref/source/player-equip.cc')
| -rw-r--r-- | crawl-ref/source/player-equip.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc index 9fab6fd438..dee8324a86 100644 --- a/crawl-ref/source/player-equip.cc +++ b/crawl-ref/source/player-equip.cc @@ -68,10 +68,7 @@ void equip_item(equipment_type slot, int item_slot, bool msg) ASSERT(you.equip[slot] == -1); ASSERT(!you.melded[slot]); - // Maybe this prevent a carried item from allowing training. - maybe_change_train(you.inv[item_slot], false); you.equip[slot] = item_slot; - item_skills(you.inv[item_slot], you.start_train); _equip_effect(slot, item_slot, false, msg); ash_check_bondage(); @@ -90,10 +87,7 @@ bool unequip_item(equipment_type slot, bool msg) return false; else { - item_skills(you.inv[item_slot], you.stop_train); you.equip[slot] = -1; - // Maybe this allows training for a carried item. - maybe_change_train(you.inv[item_slot], true); if (!you.melded[slot]) _unequip_effect(slot, item_slot, false, msg); @@ -198,9 +192,6 @@ static void _unequip_effect(equipment_type slot, int item_slot, bool meld, _unequip_armour_effect(item, meld); else if (slot >= EQ_LEFT_RING && slot < NUM_EQUIP) _unequip_jewellery_effect(item, msg, meld); - - if (slot == EQ_SHIELD && !meld) - you.stop_train.insert(SK_SHIELDS); } /////////////////////////////////////////////////////////// |