added constructor and cpp for drawable. Changed combat to extend drawable