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.

1 files changed, 0 insertions, 8 deletions

diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc
index 8668ef303f..2d7145db8b 100644
--- a/crawl-ref/source/skills.cc
+++ b/crawl-ref/source/skills.cc
@@ -310,13 +310,6 @@ static void _check_inventory_skills()
     }
 }
 
-static void _check_equipment_skills()
-{
-    skill_set_iter it = you.stop_train.find(SK_SHIELDS);
-    if (it != you.stop_train.end() && you.slot_item(EQ_SHIELD, true))
-        you.stop_train.erase(it);
-}
-
 static void _check_spell_skills()
 {
     for (int i = 0; i < MAX_KNOWN_SPELLS; i++)
@@ -407,7 +400,6 @@ static void _check_start_train()
 static void _check_stop_train()
 {
     _check_inventory_skills();
-    _check_equipment_skills();
     _check_spell_skills();
     _check_abil_skills();