- updates to g_combat.c
- moved some functions
- renamed some functions