Some work on g_weapon.c