calls drawCombatUI once instead of repeatedly
Merge remote-tracking branch 'origin/master'