Units holding weapons are handled better
Else condition may be needed sometimes
Merge pull request #865 from AndO3131/drawingRoutines

Variable _canHoldWeapon used in Armor class