Baldur's Gate II had at least one staff-spear (or spear-staff) which used the Quarterstaff proficiency.