reverted a lot and fixed segfault in g_combat.c