Move further towards removing _crInvEquipped

src/Dodge/Inventory/RBList.hs

@@ -36,7 +36,6 @@ updateRBList w
 chooseEquipmentPosition :: Creature -> [EquipPosition] -> Int
 chooseEquipmentPosition cr eps = fromMaybe (chooseFreeSite cr eps) $ do
     i <- cr ^? crManipulation . manObject . imSelectedItem
-    --ep <- cr ^? crInvEquipped . ix i
     ep <- cr ^? crInv . ix i . itLocation . ilEquipPosition . _Just
     elemIndex ep eps
 
@@ -52,7 +51,6 @@ getEquipmentAllocation w = fromMaybe DoNotMoveEquipment $ do
     i <- w ^? rbOptions . opSel
         <|> Just (chooseEquipmentPosition (you w) (equipSiteToPositions esite))
     es <- equipSiteToPositions esite ^? ix i
-    --return $ case you w ^? crInvEquipped . ix curpos of
     return $ case you w ^? crInv . ix curpos . itLocation . ilEquipPosition . _Just of
         Just epos
             | es == epos -> RemoveEquipment{_allocOldPos = epos}

src/Dodge/Inventory/SelectionList.hs

@@ -34,7 +34,6 @@ invSelectionItem indent cr i ci =
     anyhotkey = maybe [] ((' ' :) . hotkeyToString) (cr ^? crInvHotkeys . ix i)
     anyequippos = maybe [] (rightPad 8 ' ' . (' ' :) . eqPosText) 
         (ci ^? _1 . itLocation . ilEquipPosition . _Just)
---        (cr ^? crInvEquipped . ix i)
     col = itemInvColor ci
     pics = itemDisplay cr ci