combat_over changed to combat.  If true then combat continues.  If
false, combat is over