added Weapon and Bullet typedefs.