Shield fixes

Fixed bugs with shields, such as infinite wood smashing sounds when
multiple shields in inventory at same time and one is damaged. Also some
more crashes. :(
Merge remote-tracking branch 'origin/Matt's-Branch'