Update combat status before hiding

Closes #200.