Fix origin for combat.

Also added combat:setOrigin.