Move menu stuff out of ChangeWeapon function
Change to appropriate weapon after cancelling build (fixes #77)