fix build break: switchWeapon given argument.
merge battle play state.