Weapon state preserved through map change (fixes #75)