equipped weapon persists across levels

#872