prevent null weapon from being included in the inventory dump
Add iuse_actor to C::B

Helps if you want CodeBlocks to compile!
Merge bugfixes.